Skip to content

Commit 5392827

Browse files
kinnisonkinnison
authored
Merge pull request #2584 from kinnison/macos-ci-tweaks
Macos ci tweaks
2 parents e80ad24 + e1d5d9b commit 5392827

10 files changed

+86
-0
lines changed

‎.github/workflows/linux-builds-on-master.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,13 @@ jobs:
121121
--rm \
122122
"${DOCKER}" \
123123
-c 'PATH="${PATH}":/rustc-sysroot/bin bash ci/run.bash'
124+
- name: Upload the built artifact
125+
uses: actions/upload-artifact@v2
126+
with:
127+
name: rustup-init-${{ matrix.target }}
128+
path: |
129+
target/${{ matrix.target }}/release/rustup-init
130+
retention-days: 7
124131
- name: Acquire the AWS tooling
125132
run: |
126133
pip3 install -U setuptools

‎.github/workflows/linux-builds-on-pr.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,13 @@ jobs:
114114
--rm \
115115
"${DOCKER}" \
116116
-c 'PATH="${PATH}":/rustc-sysroot/bin bash ci/run.bash'
117+
- name: Upload the built artifact
118+
uses: actions/upload-artifact@v2
119+
with:
120+
name: rustup-init-${{ matrix.target }}
121+
path: |
122+
target/${{ matrix.target }}/release/rustup-init
123+
retention-days: 7
117124
- name: Acquire the AWS tooling
118125
run: |
119126
pip3 install -U setuptools

‎.github/workflows/linux-builds-on-stable.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,13 @@ jobs:
144144
--rm \
145145
"${DOCKER}" \
146146
-c 'PATH="${PATH}":/rustc-sysroot/bin bash ci/run.bash'
147+
- name: Upload the built artifact
148+
uses: actions/upload-artifact@v2
149+
with:
150+
name: rustup-init-${{ matrix.target }}
151+
path: |
152+
target/${{ matrix.target }}/release/rustup-init
153+
retention-days: 7
147154
- name: Acquire the AWS tooling
148155
run: |
149156
pip3 install -U setuptools

‎.github/workflows/macos-builds-on-all.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ jobs:
4242
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
4343
echo "TARGET=${{ matrix.target }}" >> $GITHUB_ENV
4444
echo "SKIP_TESTS=" >> $GITHUB_ENV
45+
echo "LZMA_API_STATIC=1" >> $GITHUB_ENV
4546
- name: Cache cargo registry and git trees
4647
uses: actions/cache@v2
4748
with:
@@ -90,6 +91,20 @@ jobs:
9091
rustup target install "$TARGET"
9192
- name: Run a full build and test
9293
run: bash ci/run.bash
94+
- name: Dump dynamic link targets
95+
run: |
96+
otool -L target/${TARGET}/release/rustup-init
97+
if otool -L target/${TARGET}/release/rustup-init | grep -q -F /usr/local/; then
98+
echo >&2 "Unfortunately there are /usr/local things in the link. Fail."
99+
exit 1
100+
fi
101+
- name: Upload the built artifact
102+
uses: actions/upload-artifact@v2
103+
with:
104+
name: rustup-init-${{ matrix.target }}
105+
path: |
106+
target/${{ matrix.target }}/release/rustup-init
107+
retention-days: 7
93108
- name: Acquire the AWS tooling
94109
run: |
95110
pip3 install awscli

‎.github/workflows/windows-builds-on-master.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,13 @@ jobs:
9797
rustup target install ${{ matrix.target }}
9898
- name: Run a full build
9999
run: bash ci/run.bash
100+
- name: Upload the built artifact
101+
uses: actions/upload-artifact@v2
102+
with:
103+
name: rustup-init-${{ matrix.target }}
104+
path: |
105+
target/${{ matrix.target }}/release/rustup-init.exe
106+
retention-days: 7
100107
- name: Acquire the AWS tooling
101108
run: |
102109
choco upgrade awscli

‎.github/workflows/windows-builds-on-pr.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,13 @@ jobs:
9494
rustup target install ${{ matrix.target }}
9595
- name: Run a full build
9696
run: bash ci/run.bash
97+
- name: Upload the built artifact
98+
uses: actions/upload-artifact@v2
99+
with:
100+
name: rustup-init-${{ matrix.target }}
101+
path: |
102+
target/${{ matrix.target }}/release/rustup-init.exe
103+
retention-days: 7
97104
- name: Acquire the AWS tooling
98105
run: |
99106
choco upgrade awscli

‎.github/workflows/windows-builds-on-stable.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,13 @@ jobs:
9797
rustup target install ${{ matrix.target }}
9898
- name: Run a full build
9999
run: bash ci/run.bash
100+
- name: Upload the built artifact
101+
uses: actions/upload-artifact@v2
102+
with:
103+
name: rustup-init-${{ matrix.target }}
104+
path: |
105+
target/${{ matrix.target }}/release/rustup-init.exe
106+
retention-days: 7
100107
- name: Acquire the AWS tooling
101108
run: |
102109
choco upgrade awscli

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,13 @@ jobs:
152152
--rm \
153153
"${DOCKER}" \
154154
-c 'PATH="${PATH}":/rustc-sysroot/bin bash ci/run.bash'
155+
- name: Upload the built artifact
156+
uses: actions/upload-artifact@v2
157+
with:
158+
name: rustup-init-${{ matrix.target }}
159+
path: |
160+
target/${{ matrix.target }}/release/rustup-init
161+
retention-days: 7
155162
- name: Acquire the AWS tooling
156163
run: |
157164
pip3 install -U setuptools

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ jobs:
4242
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
4343
echo "TARGET=${{ matrix.target }}" >> $GITHUB_ENV
4444
echo "SKIP_TESTS=" >> $GITHUB_ENV
45+
echo "LZMA_API_STATIC=1" >> $GITHUB_ENV
4546
- name: Cache cargo registry and git trees
4647
uses: actions/cache@v2
4748
with:
@@ -90,6 +91,20 @@ jobs:
9091
rustup target install "$TARGET"
9192
- name: Run a full build and test
9293
run: bash ci/run.bash
94+
- name: Dump dynamic link targets
95+
run: |
96+
otool -L target/${TARGET}/release/rustup-init
97+
if otool -L target/${TARGET}/release/rustup-init | grep -q -F /usr/local/; then
98+
echo >&2 "Unfortunately there are /usr/local things in the link. Fail."
99+
exit 1
100+
fi
101+
- name: Upload the built artifact
102+
uses: actions/upload-artifact@v2
103+
with:
104+
name: rustup-init-${{ matrix.target }}
105+
path: |
106+
target/${{ matrix.target }}/release/rustup-init
107+
retention-days: 7
93108
- name: Acquire the AWS tooling
94109
run: |
95110
pip3 install awscli

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,13 @@ jobs:
105105
rustup target install ${{ matrix.target }}
106106
- name: Run a full build
107107
run: bash ci/run.bash
108+
- name: Upload the built artifact
109+
uses: actions/upload-artifact@v2
110+
with:
111+
name: rustup-init-${{ matrix.target }}
112+
path: |
113+
target/${{ matrix.target }}/release/rustup-init.exe
114+
retention-days: 7
108115
- name: Acquire the AWS tooling
109116
run: |
110117
choco upgrade awscli

0 commit comments

Comments
 (0)
⚡