Skip to content

Commit fa30c71

Browse files
committed
ci: fix ci
1 parent b2284b4 commit fa30c71

File tree

2 files changed

+17
-40
lines changed

2 files changed

+17
-40
lines changed

.github/workflows/release.yml

Lines changed: 17 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -49,59 +49,37 @@ jobs:
4949
matrix:
5050
# When updating this list, the reminder to update the target list in ci.yml.
5151
include:
52-
# Native builds
5352
- target: x86_64-unknown-linux-gnu
54-
os: ubuntu-22.04
55-
container: ubuntu:18.04
53+
os: ubuntu-latest
5654
- target: x86_64-pc-windows-msvc
5755
os: windows-latest
58-
container:
5956
- target: i686-pc-windows-msvc
6057
os: windows-latest
61-
container:
62-
- target: universal-apple-darwin
58+
- target: aarch64-apple-darwin
6359
os: macos-latest
64-
container:
60+
- target: x86_64-apple-darwin
61+
os: macos-latest
62+
# - target: universal-apple-darwin
63+
# os: macos-latest
6564

66-
# Builds using cross
67-
- target: x86_64-unknown-linux-musl
68-
os: ubuntu-22.04
69-
# musl is statically linked and uses cross
70-
container:
7165
- target: aarch64-unknown-linux-gnu
72-
os: ubuntu-22.04
73-
# uses cross
74-
container:
66+
os: ubuntu-latest
67+
- target: x86_64-unknown-linux-musl
68+
os: ubuntu-latest
7569
- target: x86_64-unknown-freebsd
76-
os: ubuntu-22.04
77-
# uses cross
78-
container:
70+
os: ubuntu-latest
7971
- target: x86_64-unknown-illumos
80-
os: ubuntu-22.04
81-
# uses cross
82-
container:
72+
os: ubuntu-latest
8373
runs-on: ${{ matrix.os }}
84-
container: ${{ matrix.container }}
8574
steps:
86-
- if: matrix.container == 'ubuntu:18.04'
87-
run: |
88-
set -eu
89-
apt-get -qq update
90-
apt-get install -y software-properties-common sudo build-essential curl jq
91-
add-apt-repository ppa:git-core/ppa
92-
apt-get -qq update
93-
apt-get -qq -y install git-core
94-
git config --global --add safe.directory "${GITHUB_WORKSPACE}"
95-
# gh is required by taiki-e/upload-rust-binary-action
96-
curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
97-
&& sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
98-
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
99-
&& sudo apt-get -qq update \
100-
&& sudo apt-get -qq -y install gh
10175
- uses: actions/checkout@v3
10276
with:
10377
persist-credentials: false
104-
- uses: dtolnay/rust-toolchain@stable
78+
- name: Install cross-compilation tools
79+
uses: taiki-e/setup-cross-toolchain-action@v1
80+
with:
81+
target: ${{ matrix.target }}
82+
if: startsWith(matrix.os, 'ubuntu') && !contains(fromJSON('["x86_64-unknown-illumos", "x86_64-unknown-linux-musl"]'), matrix.target)
10583
- name: Get tag
10684
id: tag
10785
uses: dawidd6/[email protected]
@@ -111,6 +89,7 @@ jobs:
11189
- uses: taiki-e/upload-rust-binary-action@v1
11290
with:
11391
bin: git-semver-tags
92+
include: LICENSE,README.md
11493
archive: $bin-${{steps.tag.outputs.tag}}-$target
11594
target: ${{ matrix.target }}
11695
tar: all

.github/workflows/test_upload.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ jobs:
3434
matrix:
3535
# When updating this list, the reminder to update the target list in ci.yml.
3636
include:
37-
# Native builds
3837
- target: x86_64-unknown-linux-gnu
3938
os: ubuntu-latest
4039
- target: x86_64-pc-windows-msvc
@@ -48,7 +47,6 @@ jobs:
4847
# - target: universal-apple-darwin
4948
# os: macos-latest
5049

51-
# Builds using cross
5250
- target: aarch64-unknown-linux-gnu
5351
os: ubuntu-latest
5452
- target: x86_64-unknown-linux-musl

0 commit comments

Comments
 (0)