Skip to content

Commit 8c76204

Browse files
jdnorami3l
jdno
authored and
rami3l
committed
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.
1 parent f268633 commit 8c76204

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,11 @@ jobs:
141141
target/${{ matrix.target }}/release/rustup-init.exe
142142
retention-days: 7
143143
- name: Acquire the AWS tooling
144-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
144+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
145145
run: |
146146
choco upgrade awscli
147147
- name: Prepare the dist
148-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
148+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
149149
run: |
150150
.\ci\prepare-deploy.ps1
151151
shell: powershell
@@ -298,11 +298,11 @@ jobs:
298298
target/${{ matrix.target }}/release/rustup-init.exe
299299
retention-days: 7
300300
- name: Acquire the AWS tooling
301-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
301+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
302302
run: |
303303
choco upgrade awscli
304304
- name: Prepare the dist
305-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
305+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
306306
run: |
307307
.\ci\prepare-deploy.ps1
308308
shell: powershell
@@ -461,11 +461,11 @@ jobs:
461461
target/${{ matrix.target }}/release/rustup-init.exe
462462
retention-days: 7
463463
- name: Acquire the AWS tooling
464-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
464+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
465465
run: |
466466
choco upgrade awscli
467467
- name: Prepare the dist
468-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
468+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
469469
run: |
470470
.\ci\prepare-deploy.ps1
471471
shell: powershell
@@ -620,12 +620,12 @@ jobs:
620620
target/${{ matrix.target }}/release/rustup-init
621621
retention-days: 7
622622
- name: Ensure that awscli is installed
623-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
623+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
624624
run: |
625625
which aws
626626
aws --version
627627
- name: Prepare the dist
628-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
628+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
629629
run: |
630630
bash ci/prepare-deploy.bash
631631
- name: Deploy build to dev-static dist tree for release team
@@ -784,12 +784,12 @@ jobs:
784784
target/${{ matrix.target }}/release/rustup-init
785785
retention-days: 7
786786
- name: Ensure that awscli is installed
787-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
787+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
788788
run: |
789789
which aws
790790
aws --version
791791
- name: Prepare the dist
792-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
792+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
793793
run: |
794794
bash ci/prepare-deploy.bash
795795
- name: Deploy build to dev-static dist tree for release team
@@ -969,12 +969,12 @@ jobs:
969969
target/${{ matrix.target }}/release/rustup-init
970970
retention-days: 7
971971
- name: Ensure that awscli is installed
972-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
972+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
973973
run: |
974974
which aws
975975
aws --version
976976
- name: Prepare the dist
977-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
977+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
978978
run: |
979979
bash ci/prepare-deploy.bash
980980
- name: Deploy build to dev-static dist tree for release team
@@ -1094,12 +1094,12 @@ jobs:
10941094
target/${{ matrix.target }}/release/rustup-init
10951095
retention-days: 7
10961096
- name: Ensure that awscli is installed
1097-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
1097+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
10981098
run: |
10991099
which aws
11001100
aws --version
11011101
- name: Prepare the dist
1102-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
1102+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
11031103
run: |
11041104
bash ci/prepare-deploy.bash
11051105
- name: Deploy build to dev-static dist tree for release team
@@ -1225,12 +1225,12 @@ jobs:
12251225
target/${{ matrix.target }}/release/rustup-init
12261226
retention-days: 7
12271227
- name: Ensure that awscli is installed
1228-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
1228+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
12291229
run: |
12301230
which aws
12311231
aws --version
12321232
- name: Prepare the dist
1233-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
1233+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
12341234
run: |
12351235
bash ci/prepare-deploy.bash
12361236
- name: Deploy build to dev-static dist tree for release team

‎ci/actions-templates/linux-builds-template.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,12 @@ jobs: # skip-master skip-pr skip-stable
157157
target/${{ matrix.target }}/release/rustup-init
158158
retention-days: 7
159159
- name: Ensure that awscli is installed
160-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
160+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
161161
run: |
162162
which aws
163163
aws --version
164164
- name: Prepare the dist
165-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
165+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
166166
run: |
167167
bash ci/prepare-deploy.bash
168168
- name: Deploy build to dev-static dist tree for release team

‎ci/actions-templates/macos-builds-template.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ jobs: # skip-x86_64 skip-aarch64
9797
target/${{ matrix.target }}/release/rustup-init
9898
retention-days: 7
9999
- name: Ensure that awscli is installed
100-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
100+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
101101
run: |
102102
which aws
103103
aws --version
104104
- name: Prepare the dist
105-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
105+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
106106
run: |
107107
bash ci/prepare-deploy.bash
108108
- name: Deploy build to dev-static dist tree for release team

‎ci/actions-templates/windows-builds-template.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,11 @@ jobs: # skip-master skip-pr skip-stable
134134
target/${{ matrix.target }}/release/rustup-init.exe
135135
retention-days: 7
136136
- name: Acquire the AWS tooling
137-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
137+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
138138
run: |
139139
choco upgrade awscli
140140
- name: Prepare the dist
141-
if: github.event_name == 'push' && github.ref == 'refs/heads/stable' && matrix.mode == 'release'
141+
if: github.event_name == 'push' && matrix.mode == 'release' && (github.ref == 'refs/heads/stable' || github.ref == 'refs/heads/master')
142142
run: |
143143
.\ci\prepare-deploy.ps1
144144
shell: powershell

0 commit comments

Comments
 (0)