Skip to content

Commit

Permalink
Prepare deployment on master branch
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@jdno @rami3l
jdno authored and rami3l committed Jul 9, 2024
1 parent f268633 commit 8c76204
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 22 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ci/actions-templates/linux-builds-template.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ci/actions-templates/macos-builds-template.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ci/actions-templates/windows-builds-template.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8c76204

Please sign in to comment.