Skip to content

Macos ci tweaks #2584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kinnison merged 4 commits into from
Nov 29, 2020
Merged

Macos ci tweaks #2584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1601564
ci: Improve chances of macos builds working on 10.13
kinnison Nov 29, 2020
2c0dbf1
ci: Run gen-workflows
kinnison Nov 29, 2020
acba3e1
ci: Add artifact upload to workflows
kinnison Nov 29, 2020
e1d5d9b
ci: Rerun gen-workflows
kinnison Nov 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/linux-builds-on-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,13 @@ jobs:
--rm \
"${DOCKER}" \
-c 'PATH="${PATH}":/rustc-sysroot/bin bash ci/run.bash'
- name: Upload the built artifact
uses: actions/upload-artifact@v2
with:
name: rustup-init-${{ matrix.target }}
path: |
target/${{ matrix.target }}/release/rustup-init
retention-days: 7
- name: Acquire the AWS tooling
run: |
pip3 install -U setuptools
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/linux-builds-on-pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,13 @@ jobs:
--rm \
"${DOCKER}" \
-c 'PATH="${PATH}":/rustc-sysroot/bin bash ci/run.bash'
- name: Upload the built artifact
uses: actions/upload-artifact@v2
with:
name: rustup-init-${{ matrix.target }}
path: |
target/${{ matrix.target }}/release/rustup-init
retention-days: 7
- name: Acquire the AWS tooling
run: |
pip3 install -U setuptools
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/linux-builds-on-stable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,13 @@ jobs:
--rm \
"${DOCKER}" \
-c 'PATH="${PATH}":/rustc-sysroot/bin bash ci/run.bash'
- name: Upload the built artifact
uses: actions/upload-artifact@v2
with:
name: rustup-init-${{ matrix.target }}
path: |
target/${{ matrix.target }}/release/rustup-init
retention-days: 7
- name: Acquire the AWS tooling
run: |
pip3 install -U setuptools
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/macos-builds-on-all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ jobs:
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
echo "TARGET=${{ matrix.target }}" >> $GITHUB_ENV
echo "SKIP_TESTS=" >> $GITHUB_ENV
echo "LZMA_API_STATIC=1" >> $GITHUB_ENV
- name: Cache cargo registry and git trees
uses: actions/cache@v2
with:
Expand Down Expand Up @@ -90,6 +91,20 @@ jobs:
rustup target install "$TARGET"
- name: Run a full build and test
run: bash ci/run.bash
- name: Dump dynamic link targets
run: |
otool -L target/${TARGET}/release/rustup-init
if otool -L target/${TARGET}/release/rustup-init | grep -q -F /usr/local/; then
echo >&2 "Unfortunately there are /usr/local things in the link. Fail."
exit 1
fi
- name: Upload the built artifact
uses: actions/upload-artifact@v2
with:
name: rustup-init-${{ matrix.target }}
path: |
target/${{ matrix.target }}/release/rustup-init
retention-days: 7
- name: Acquire the AWS tooling
run: |
pip3 install awscli
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/windows-builds-on-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,13 @@ jobs:
rustup target install ${{ matrix.target }}
- name: Run a full build
run: bash ci/run.bash
- name: Upload the built artifact
uses: actions/upload-artifact@v2
with:
name: rustup-init-${{ matrix.target }}
path: |
target/${{ matrix.target }}/release/rustup-init.exe
retention-days: 7
- name: Acquire the AWS tooling
run: |
choco upgrade awscli
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/windows-builds-on-pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,13 @@ jobs:
rustup target install ${{ matrix.target }}
- name: Run a full build
run: bash ci/run.bash
- name: Upload the built artifact
uses: actions/upload-artifact@v2
with:
name: rustup-init-${{ matrix.target }}
path: |
target/${{ matrix.target }}/release/rustup-init.exe
retention-days: 7
- name: Acquire the AWS tooling
run: |
choco upgrade awscli
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/windows-builds-on-stable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,13 @@ jobs:
rustup target install ${{ matrix.target }}
- name: Run a full build
run: bash ci/run.bash
- name: Upload the built artifact
uses: actions/upload-artifact@v2
with:
name: rustup-init-${{ matrix.target }}
path: |
target/${{ matrix.target }}/release/rustup-init.exe
retention-days: 7
- name: Acquire the AWS tooling
run: |
choco upgrade awscli
Expand Down
7 changes: 7 additions & 0 deletions ci/actions-templates/linux-builds-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,13 @@ jobs:
--rm \
"${DOCKER}" \
-c 'PATH="${PATH}":/rustc-sysroot/bin bash ci/run.bash'
- name: Upload the built artifact
uses: actions/upload-artifact@v2
with:
name: rustup-init-${{ matrix.target }}
path: |
target/${{ matrix.target }}/release/rustup-init
retention-days: 7
- name: Acquire the AWS tooling
run: |
pip3 install -U setuptools
Expand Down
15 changes: 15 additions & 0 deletions ci/actions-templates/macos-builds-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ jobs:
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
echo "TARGET=${{ matrix.target }}" >> $GITHUB_ENV
echo "SKIP_TESTS=" >> $GITHUB_ENV
echo "LZMA_API_STATIC=1" >> $GITHUB_ENV
- name: Cache cargo registry and git trees
uses: actions/cache@v2
with:
Expand Down Expand Up @@ -90,6 +91,20 @@ jobs:
rustup target install "$TARGET"
- name: Run a full build and test
run: bash ci/run.bash
- name: Dump dynamic link targets
run: |
otool -L target/${TARGET}/release/rustup-init
if otool -L target/${TARGET}/release/rustup-init | grep -q -F /usr/local/; then
echo >&2 "Unfortunately there are /usr/local things in the link. Fail."
exit 1
fi
- name: Upload the built artifact
uses: actions/upload-artifact@v2
with:
name: rustup-init-${{ matrix.target }}
path: |
target/${{ matrix.target }}/release/rustup-init
retention-days: 7
- name: Acquire the AWS tooling
run: |
pip3 install awscli
Expand Down
7 changes: 7 additions & 0 deletions ci/actions-templates/windows-builds-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,13 @@ jobs:
rustup target install ${{ matrix.target }}
- name: Run a full build
run: bash ci/run.bash
- name: Upload the built artifact
uses: actions/upload-artifact@v2
with:
name: rustup-init-${{ matrix.target }}
path: |
target/${{ matrix.target }}/release/rustup-init.exe
retention-days: 7
- name: Acquire the AWS tooling
run: |
choco upgrade awscli
Expand Down
⚡