From 25d88b0b09dea65ae472e48f81296f3fb693a108 Mon Sep 17 00:00:00 2001 From: oddgrd <29732646+oddgrd@users.noreply.github.com> Date: Fri, 24 Feb 2023 12:19:10 +0100 Subject: [PATCH 1/2] fix: short form git tag, remove target from bin --- .circleci/config.yml | 124 +++++++++++++++++++++---------------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a286a1617..a04f5ccfd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -121,7 +121,7 @@ commands: - run: name: Set git tag in the environment command: | - echo TAG=$(git describe --tags) >> $BASH_ENV + echo TAG=$(git describe --tags --abbrev=0) >> $BASH_ENV - run: name: Set binary directory in the environment command: | @@ -130,7 +130,7 @@ commands: name: Make artifact command: | mkdir $BIN_DIR - mv target/<< parameters.target >>/release/cargo-shuttle<< parameters.suffix >> $BIN_DIR/cargo-shuttle-<< parameters.target >><< parameters.suffix >> + mv target/<< parameters.target >>/release/cargo-shuttle<< parameters.suffix >> $BIN_DIR/cargo-shuttle<< parameters.suffix >> mv LICENSE $BIN_DIR/ mv README.md $BIN_DIR/ mkdir -p artifacts/<< parameters.target >> @@ -388,78 +388,78 @@ jobs: workflows: ci: jobs: - - workspace-fmt - - workspace-clippy: - name: workspace-clippy-<< matrix.framework >> - requires: - - workspace-fmt - matrix: - parameters: - framework: ["web-actix-web", "web-axum", "web-rocket", "web-poem", "web-thruster", "web-tide", "web-tower","web-warp", "web-salvo", "bot-serenity", "bot-poise"] - - check-standalone: - matrix: - parameters: - path: - - resources/aws-rds - - resources/persist - - resources/secrets - - resources/shared-db - - resources/static-folder - - service-test: - requires: - - workspace-clippy - - platform-test: - requires: - - workspace-clippy - matrix: - parameters: - crate: ["shuttle-auth", "shuttle-deployer", "cargo-shuttle", "shuttle-codegen", "shuttle-common", "shuttle-proto", "shuttle-provisioner"] - - e2e-test: - requires: - - service-test - - platform-test - - check-standalone - filters: - branches: - only: production - - build-and-push: - requires: - - e2e-test - filters: - branches: - only: production + # - workspace-fmt + # - workspace-clippy: + # name: workspace-clippy-<< matrix.framework >> + # requires: + # - workspace-fmt + # matrix: + # parameters: + # framework: ["web-actix-web", "web-axum", "web-rocket", "web-poem", "web-thruster", "web-tide", "web-tower","web-warp", "web-salvo", "bot-serenity", "bot-poise"] + # - check-standalone: + # matrix: + # parameters: + # path: + # - resources/aws-rds + # - resources/persist + # - resources/secrets + # - resources/shared-db + # - resources/static-folder + # - service-test: + # requires: + # - workspace-clippy + # - platform-test: + # requires: + # - workspace-clippy + # matrix: + # parameters: + # crate: ["shuttle-auth", "shuttle-deployer", "cargo-shuttle", "shuttle-codegen", "shuttle-common", "shuttle-proto", "shuttle-provisioner"] + # - e2e-test: + # requires: + # - service-test + # - platform-test + # - check-standalone + # filters: + # branches: + # only: production + # - build-and-push: + # requires: + # - e2e-test + # filters: + # branches: + # only: production - build-binaries-linux: name: build-binaries-x86_64-gnu image: ubuntu-2204:2022.04.1 target: x86_64-unknown-linux-gnu resource_class: medium - filters: - branches: - only: production + # filters: + # branches: + # only: production - build-binaries-linux: name: build-binaries-x86_64-musl image: ubuntu-2204:2022.04.1 target: x86_64-unknown-linux-musl resource_class: medium - filters: - branches: - only: production + # filters: + # branches: + # only: production - build-binaries-linux: name: build-binaries-aarch64 image: ubuntu-2004:202101-01 target: aarch64-unknown-linux-musl resource_class: arm.medium - filters: - branches: - only: production - - build-binaries-windows: - filters: - branches: - only: production - - build-binaries-mac: - filters: - branches: - only: production + # filters: + # branches: + # only: production + - build-binaries-windows + # filters: + # branches: + # only: production + - build-binaries-mac + # filters: + # branches: + # only: production - publish-github-release: requires: - build-binaries-x86_64-gnu @@ -467,6 +467,6 @@ workflows: - build-binaries-aarch64 - build-binaries-windows - build-binaries-mac - filters: - branches: - only: production + # filters: + # branches: + # only: production From b4175b3802497fc12125089efafb5068f3fa511c Mon Sep 17 00:00:00 2001 From: oddgrd <29732646+oddgrd@users.noreply.github.com> Date: Fri, 24 Feb 2023 12:50:36 +0100 Subject: [PATCH 2/2] refactor: uncomment other jobs --- .circleci/config.yml | 120 +++++++++++++++++++++---------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a04f5ccfd..544eea807 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -388,78 +388,78 @@ jobs: workflows: ci: jobs: - # - workspace-fmt - # - workspace-clippy: - # name: workspace-clippy-<< matrix.framework >> - # requires: - # - workspace-fmt - # matrix: - # parameters: - # framework: ["web-actix-web", "web-axum", "web-rocket", "web-poem", "web-thruster", "web-tide", "web-tower","web-warp", "web-salvo", "bot-serenity", "bot-poise"] - # - check-standalone: - # matrix: - # parameters: - # path: - # - resources/aws-rds - # - resources/persist - # - resources/secrets - # - resources/shared-db - # - resources/static-folder - # - service-test: - # requires: - # - workspace-clippy - # - platform-test: - # requires: - # - workspace-clippy - # matrix: - # parameters: - # crate: ["shuttle-auth", "shuttle-deployer", "cargo-shuttle", "shuttle-codegen", "shuttle-common", "shuttle-proto", "shuttle-provisioner"] - # - e2e-test: - # requires: - # - service-test - # - platform-test - # - check-standalone - # filters: - # branches: - # only: production - # - build-and-push: - # requires: - # - e2e-test - # filters: - # branches: - # only: production + - workspace-fmt + - workspace-clippy: + name: workspace-clippy-<< matrix.framework >> + requires: + - workspace-fmt + matrix: + parameters: + framework: ["web-actix-web", "web-axum", "web-rocket", "web-poem", "web-thruster", "web-tide", "web-tower","web-warp", "web-salvo", "bot-serenity", "bot-poise"] + - check-standalone: + matrix: + parameters: + path: + - resources/aws-rds + - resources/persist + - resources/secrets + - resources/shared-db + - resources/static-folder + - service-test: + requires: + - workspace-clippy + - platform-test: + requires: + - workspace-clippy + matrix: + parameters: + crate: ["shuttle-auth", "shuttle-deployer", "cargo-shuttle", "shuttle-codegen", "shuttle-common", "shuttle-proto", "shuttle-provisioner"] + - e2e-test: + requires: + - service-test + - platform-test + - check-standalone + filters: + branches: + only: production + - build-and-push: + requires: + - e2e-test + filters: + branches: + only: production - build-binaries-linux: name: build-binaries-x86_64-gnu image: ubuntu-2204:2022.04.1 target: x86_64-unknown-linux-gnu resource_class: medium - # filters: - # branches: - # only: production + filters: + branches: + only: production - build-binaries-linux: name: build-binaries-x86_64-musl image: ubuntu-2204:2022.04.1 target: x86_64-unknown-linux-musl resource_class: medium - # filters: - # branches: - # only: production + filters: + branches: + only: production - build-binaries-linux: name: build-binaries-aarch64 image: ubuntu-2004:202101-01 target: aarch64-unknown-linux-musl resource_class: arm.medium - # filters: - # branches: - # only: production - - build-binaries-windows - # filters: - # branches: - # only: production - - build-binaries-mac - # filters: - # branches: - # only: production + filters: + branches: + only: production + - build-binaries-windows: + filters: + branches: + only: production + - build-binaries-mac: + filters: + branches: + only: production - publish-github-release: requires: - build-binaries-x86_64-gnu @@ -467,6 +467,6 @@ workflows: - build-binaries-aarch64 - build-binaries-windows - build-binaries-mac - # filters: - # branches: - # only: production + filters: + branches: + only: production