From fa4b929a06969578015ae2a8ed1124f64f7714a4 Mon Sep 17 00:00:00 2001 From: cloudhead Date: Mon, 11 Mar 2024 16:54:52 +0100 Subject: [PATCH] ci: Remove old deploy script, cleanup build --- .github/workflows/build.bash | 46 ++++++++++++++++++------------------ .github/workflows/deploy.yml | 41 -------------------------------- 2 files changed, 23 insertions(+), 64 deletions(-) delete mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/build.bash b/.github/workflows/build.bash index 4bac402d..454ac1cd 100755 --- a/.github/workflows/build.bash +++ b/.github/workflows/build.bash @@ -27,38 +27,38 @@ install() { } main () { - if [ $# -ne 1 ]; then - echo "$#: Wrong number of arguments" - exit 1 - fi + if [ $# -ne 1 ]; then + echo "$#: Wrong number of arguments" + exit 1 + fi - if ! command -v asciidoctor >/dev/null 2>&1; then - install - fi + if ! command -v asciidoctor >/dev/null 2>&1; then + install + fi - target="$1" - rustup target add "$target" + target="$1" + rustup target add "$target" - staging="radicle-$target" - mkdir -p "$staging" + staging="radicle-$target" + mkdir -p "$staging" - cargo build --target="$target" --package=radicle-httpd --release - cp target/"$target"/release/radicle-httpd "$staging"/ - cp target/"$target"/release/rad-web "$staging"/ + cargo build --target="$target" --package=radicle-httpd --release + cp target/"$target"/release/radicle-httpd "$staging"/ + cp target/"$target"/release/rad-web "$staging"/ - cargo build --target="$target" --package=radicle-node --release - cp target/"$target"/release/radicle-node "$staging"/ + cargo build --target="$target" --package=radicle-node --release + cp target/"$target"/release/radicle-node "$staging"/ - cargo build --target="$target" --bin rad --release - cp target/"$target"/release/rad "$staging"/ + cargo build --target="$target" --bin rad --release + cp target/"$target"/release/rad "$staging"/ - cargo build --target="$target" --bin git-remote-rad --release - cp target/"$target"/release/git-remote-rad "$staging"/ + cargo build --target="$target" --bin git-remote-rad --release + cp target/"$target"/release/git-remote-rad "$staging"/ - scripts/build-man-pages.sh "$staging" $(find . -name '*.1.adoc') + scripts/build-man-pages.sh "$staging" $(find . -name '*.1.adoc') - tar czf "$staging.tar.gz" "$staging" - cp "$staging.tar.gz" "$staging"/ + tar czf "$staging.tar.gz" "$staging" + cp "$staging.tar.gz" "$staging"/ } main "$@" diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index 449436a0..00000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Deploy - -on: - push: - branches: - - deploy/* - -jobs: - build-and-push-images: - runs-on: ubuntu-latest - steps: - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Login to the container registry - uses: docker/login-action@v2 - with: - registry: gcr.io - username: _json_key - password: ${{ secrets.GCR_JSON_KEY }} - - name: Checkout code - uses: actions/checkout@v3 - - name: Build and push radicle-node - id: radicle-node - uses: docker/build-push-action@v4 - with: - context: . - file: radicle-node/Dockerfile - push: true - tags: gcr.io/radicle-services/radicle-node:latest,gcr.io/radicle-services/radicle-node:${{ github.sha }} - cache-from: type=registry,ref=gcr.io/radicle-services/radicle-node:latest - cache-to: type=inline - - name: Build and push radicle-httpd - id: radicle-httpd - uses: docker/build-push-action@v4 - with: - context: . - file: radicle-httpd/Dockerfile - push: true - tags: gcr.io/radicle-services/radicle-httpd:latest,gcr.io/radicle-services/radicle-httpd:${{ github.sha }} - cache-from: type=registry,ref=gcr.io/radicle-services/radicle-httpd:latest - cache-to: type=inline