63
63
# we specify bash to get pipefail; it guards against the `curl` command
64
64
# failing. otherwise `sh` won't catch that `curl` returned non-0
65
65
shell : bash
66
- run : " curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.25.1 /cargo-dist-installer.sh | sh"
66
+ run : " curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.28.0 /cargo-dist-installer.sh | sh"
67
67
- name : Cache dist
68
68
uses : actions/upload-artifact@v4
69
69
with :
@@ -107,6 +107,7 @@ jobs:
107
107
# - N "local" tasks that build each platform's binaries and platform-specific installers
108
108
matrix : ${{ fromJson(needs.plan.outputs.val).ci.github.artifacts_matrix }}
109
109
runs-on : ${{ matrix.runner }}
110
+ container : ${{ matrix.container && matrix.container.image || null }}
110
111
env :
111
112
GH_TOKEN : ${{ secrets.GITHUB_TOKEN }}
112
113
BUILD_MANIFEST_NAME : target/distrib/${{ join(matrix.targets, '-') }}-dist-manifest.json
@@ -117,8 +118,15 @@ jobs:
117
118
- uses : actions/checkout@v4
118
119
with :
119
120
submodules : recursive
121
+ - name : Install Rust non-interactively if not already installed
122
+ if : ${{ matrix.container }}
123
+ run : |
124
+ if ! command -v cargo > /dev/null 2>&1; then
125
+ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
126
+ echo "$HOME/.cargo/bin" >> $GITHUB_PATH
127
+ fi
120
128
- name : Install dist
121
- run : ${{ matrix.install_dist }}
129
+ run : ${{ matrix.install_dist.run }}
122
130
# Get the dist-manifest
123
131
- name : Fetch local artifacts
124
132
uses : actions/download-artifact@v4
@@ -143,7 +151,7 @@ jobs:
143
151
run : |
144
152
# Parse out what we just built and upload it to scratch storage
145
153
echo "paths<<EOF" >> "$GITHUB_OUTPUT"
146
- jq --raw-output ".upload_files[]" dist-manifest.json >> "$GITHUB_OUTPUT"
154
+ dist print-upload-files-from-manifest --manifest dist-manifest.json >> "$GITHUB_OUTPUT"
147
155
echo "EOF" >> "$GITHUB_OUTPUT"
148
156
149
157
cp dist-manifest.json "$BUILD_MANIFEST_NAME"
0 commit comments