Skip to content

Commit a2069ae

Browse files
authored
chore: fix release - revert updates (#10107)
* Revert "chore: fix release (#10098)" This reverts commit 8d482d5. * Revert "chore(deps): weekly `cargo update` (#10088)" This reverts commit a7e3421. * Cross not from main * fix clippy
1 parent 1f22112 commit a2069ae

File tree

5 files changed

+434
-395
lines changed

5 files changed

+434
-395
lines changed

.github/workflows/docker-publish.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
- uses: Swatinem/rust-cache@v2
3030
with:
3131
cache-on-failure: true
32-
- name: Install cross
33-
id: cross
32+
- name: Install cross main
33+
id: cross_main
3434
run: |
35-
cargo install cross
35+
cargo install cross --git https://github.com/cross-rs/cross
3636
# Login against a Docker registry except on PR
3737
# https://github.com/docker/login-action
3838
- name: Login into registry ${{ env.REGISTRY }}

.github/workflows/release.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -89,22 +89,22 @@ jobs:
8989
# `target`: Rust build target triple
9090
# `platform` and `arch`: Used in tarball names
9191
# `svm`: target platform to use for the Solc binary: https://github.com/roynalnaruto/svm-rs/blob/84cbe0ac705becabdc13168bae28a45ad2299749/svm-builds/build.rs#L4-L24
92-
- runner: Linux-22.04
92+
- runner: Linux-20.04
9393
target: x86_64-unknown-linux-gnu
9494
svm_target_platform: linux-amd64
9595
platform: linux
9696
arch: amd64
97-
- runner: Linux-22.04
97+
- runner: Linux-20.04
9898
target: x86_64-unknown-linux-musl
9999
svm_target_platform: linux-amd64
100100
platform: alpine
101101
arch: amd64
102-
- runner: Linux-22.04
102+
- runner: Linux-20.04
103103
target: aarch64-unknown-linux-gnu
104104
svm_target_platform: linux-aarch64
105105
platform: linux
106106
arch: arm64
107-
- runner: Linux-22.04
107+
- runner: Linux-20.04
108108
target: aarch64-unknown-linux-musl
109109
svm_target_platform: linux-aarch64
110110
platform: alpine
@@ -152,7 +152,7 @@ jobs:
152152
- name: MUSL setup
153153
if: matrix.target == 'x86_64-unknown-linux-musl' || matrix.target == 'aarch64-unknown-linux-musl'
154154
run: |
155-
cargo install cross --git https://github.com/cross-rs/cross
155+
cargo install cross
156156
157157
- name: Build binaries
158158
env:

0 commit comments

Comments
 (0)