From 945e2df1c8cc66a1ee1ebb66937c447d154b2300 Mon Sep 17 00:00:00 2001 From: Jan David Date: Tue, 9 Jul 2024 14:29:03 +0200 Subject: [PATCH] Prepare deployment on master branch We added steps to the GitHub Actions workflows in #3909 to upload the build artifacts for the `master` branch as well as for the `stable` branch. But the scripts that prepare the `deploy/` directory were not set to run on `master`, causing the builds to fail. --- .github/workflows/ci.yaml | 32 +++++++++---------- .../linux-builds-template.yaml | 4 +-- .../macos-builds-template.yaml | 4 +-- .../windows-builds-template.yaml | 4 +-- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ac2d604a4f..d160c33014 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -141,11 +141,11 @@ jobs: target/${{ matrix.target }}/release/rustup-init.exe retention-days: 7 - name: Acquire the AWS tooling - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | choco upgrade awscli - name: Prepare the dist - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | .\ci\prepare-deploy.ps1 shell: powershell @@ -298,11 +298,11 @@ jobs: target/${{ matrix.target }}/release/rustup-init.exe retention-days: 7 - name: Acquire the AWS tooling - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | choco upgrade awscli - name: Prepare the dist - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | .\ci\prepare-deploy.ps1 shell: powershell @@ -461,11 +461,11 @@ jobs: target/${{ matrix.target }}/release/rustup-init.exe retention-days: 7 - name: Acquire the AWS tooling - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | choco upgrade awscli - name: Prepare the dist - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | .\ci\prepare-deploy.ps1 shell: powershell @@ -620,12 +620,12 @@ jobs: target/${{ matrix.target }}/release/rustup-init retention-days: 7 - name: Ensure that awscli is installed - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | which aws aws --version - name: Prepare the dist - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | bash ci/prepare-deploy.bash - name: Deploy build to dev-static dist tree for release team @@ -784,12 +784,12 @@ jobs: target/${{ matrix.target }}/release/rustup-init retention-days: 7 - name: Ensure that awscli is installed - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | which aws aws --version - name: Prepare the dist - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | bash ci/prepare-deploy.bash - name: Deploy build to dev-static dist tree for release team @@ -969,12 +969,12 @@ jobs: target/${{ matrix.target }}/release/rustup-init retention-days: 7 - name: Ensure that awscli is installed - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | which aws aws --version - name: Prepare the dist - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | bash ci/prepare-deploy.bash - name: Deploy build to dev-static dist tree for release team @@ -1094,12 +1094,12 @@ jobs: target/${{ matrix.target }}/release/rustup-init retention-days: 7 - name: Ensure that awscli is installed - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | which aws aws --version - name: Prepare the dist - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | bash ci/prepare-deploy.bash - name: Deploy build to dev-static dist tree for release team @@ -1225,12 +1225,12 @@ jobs: target/${{ matrix.target }}/release/rustup-init retention-days: 7 - name: Ensure that awscli is installed - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | which aws aws --version - name: Prepare the dist - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | bash ci/prepare-deploy.bash - name: Deploy build to dev-static dist tree for release team diff --git a/ci/actions-templates/linux-builds-template.yaml b/ci/actions-templates/linux-builds-template.yaml index de25c69951..30391c959c 100644 --- a/ci/actions-templates/linux-builds-template.yaml +++ b/ci/actions-templates/linux-builds-template.yaml @@ -157,12 +157,12 @@ jobs: # skip-master skip-pr skip-stable target/${{ matrix.target }}/release/rustup-init retention-days: 7 - name: Ensure that awscli is installed - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | which aws aws --version - name: Prepare the dist - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | bash ci/prepare-deploy.bash - name: Deploy build to dev-static dist tree for release team diff --git a/ci/actions-templates/macos-builds-template.yaml b/ci/actions-templates/macos-builds-template.yaml index 760e8a7f39..85dee106af 100644 --- a/ci/actions-templates/macos-builds-template.yaml +++ b/ci/actions-templates/macos-builds-template.yaml @@ -97,12 +97,12 @@ jobs: # skip-x86_64 skip-aarch64 target/${{ matrix.target }}/release/rustup-init retention-days: 7 - name: Ensure that awscli is installed - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | which aws aws --version - name: Prepare the dist - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | bash ci/prepare-deploy.bash - name: Deploy build to dev-static dist tree for release team diff --git a/ci/actions-templates/windows-builds-template.yaml b/ci/actions-templates/windows-builds-template.yaml index 7a8ceaee05..0608da00df 100644 --- a/ci/actions-templates/windows-builds-template.yaml +++ b/ci/actions-templates/windows-builds-template.yaml @@ -134,11 +134,11 @@ jobs: # skip-master skip-pr skip-stable target/${{ matrix.target }}/release/rustup-init.exe retention-days: 7 - name: Acquire the AWS tooling - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | choco upgrade awscli - name: Prepare the dist - if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release' + if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master') run: | .\ci\prepare-deploy.ps1 shell: powershell