From d1f2eb9093727e6269c735e3dc212f3904d807a7 Mon Sep 17 00:00:00 2001 From: Keefer Taylor Date: Thu, 23 Feb 2023 14:58:52 -0800 Subject: [PATCH 1/4] show build failures on ubuntu 22.04 --- .github/workflows/automated_release.yml | 2 +- .github/workflows/integration_tests.yml | 6 +++--- .github/workflows/rust.yml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/automated_release.yml b/.github/workflows/automated_release.yml index 10d5aff9..9233d5c7 100644 --- a/.github/workflows/automated_release.yml +++ b/.github/workflows/automated_release.yml @@ -12,7 +12,7 @@ env: jobs: release: name: build-release-assets - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: # Setup Rust Environment - name: setup-rust diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 478ac648..8fbf889b 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -20,7 +20,7 @@ jobs: permissions: contents: write packages: write - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: checkout uses: actions/checkout@v2 @@ -66,7 +66,7 @@ jobs: permissions: contents: write packages: write - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: checkout uses: actions/checkout@v2 @@ -112,7 +112,7 @@ jobs: contents: write packages: write environment: CI - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: [ steward-build, hardhat-build ] strategy: fail-fast: false diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 07a7be8f..10bc0374 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -11,7 +11,7 @@ env: jobs: rust-test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout branch uses: actions/checkout@v2 @@ -30,7 +30,7 @@ jobs: run: cargo test --all --verbose rust-build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout branch uses: actions/checkout@v2 @@ -50,7 +50,7 @@ jobs: fmt: name: Rustfmt - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout branch uses: actions/checkout@v2 @@ -65,7 +65,7 @@ jobs: clippy: name: Clippy - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout branch uses: actions/checkout@v2 From a8131102f4a4363d56f019e4226e59b32e895d67 Mon Sep 17 00:00:00 2001 From: Keefer Taylor Date: Thu, 23 Feb 2023 15:00:47 -0800 Subject: [PATCH 2/4] bump pinned open ssl versions --- steward/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/steward/Cargo.toml b/steward/Cargo.toml index 41dfaf23..9ebc7e4a 100644 --- a/steward/Cargo.toml +++ b/steward/Cargo.toml @@ -51,9 +51,9 @@ lazy_static = "1.4.0" # this crate. This allows for easy cross compiled builds because the 'vendored' # feature includes it's own OpenSSL version that's compiled on the fly # If ANY crate in this workspace has this it will work for all of them. -openssl = { version = "=0.10.33", features = ["vendored"] } -openssl-sys = "=0.9.61" -openssl-probe = "0.1.4" +openssl = { version = "=0.10.45", features = ["vendored"] } +openssl-sys = "=0.9.80" +openssl-probe = "0.1.5" once_cell = "1.10.0" From fd7bd612f332f66351fe78e74e74c9f7a27be0c1 Mon Sep 17 00:00:00 2001 From: Keefer Taylor Date: Thu, 23 Feb 2023 15:08:41 -0800 Subject: [PATCH 3/4] update cargo --- Cargo.lock | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3cdb3ac2..cac008db 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3528,18 +3528,30 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.33" +version = "0.10.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577" +checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" dependencies = [ "bitflags", "cfg-if 1.0.0", "foreign-types", "libc", "once_cell", + "openssl-macros", "openssl-sys", ] +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "openssl-probe" version = "0.1.5" @@ -3557,9 +3569,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.61" +version = "0.9.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f" +checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" dependencies = [ "autocfg", "cc", From ba262c1e8ed02e1ed04a6770d0a340eea254e9ea Mon Sep 17 00:00:00 2001 From: Keefer Taylor | Tessellated Date: Mon, 13 Mar 2023 19:34:34 -0700 Subject: [PATCH 4/4] revert to show build on 20.04 --- .github/workflows/automated_release.yml | 2 +- .github/workflows/integration_tests.yml | 6 +++--- .github/workflows/rust.yml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/automated_release.yml b/.github/workflows/automated_release.yml index 9233d5c7..10d5aff9 100644 --- a/.github/workflows/automated_release.yml +++ b/.github/workflows/automated_release.yml @@ -12,7 +12,7 @@ env: jobs: release: name: build-release-assets - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: # Setup Rust Environment - name: setup-rust diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 8fbf889b..478ac648 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -20,7 +20,7 @@ jobs: permissions: contents: write packages: write - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - name: checkout uses: actions/checkout@v2 @@ -66,7 +66,7 @@ jobs: permissions: contents: write packages: write - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - name: checkout uses: actions/checkout@v2 @@ -112,7 +112,7 @@ jobs: contents: write packages: write environment: CI - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 needs: [ steward-build, hardhat-build ] strategy: fail-fast: false diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 10bc0374..07a7be8f 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -11,7 +11,7 @@ env: jobs: rust-test: - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - name: Checkout branch uses: actions/checkout@v2 @@ -30,7 +30,7 @@ jobs: run: cargo test --all --verbose rust-build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - name: Checkout branch uses: actions/checkout@v2 @@ -50,7 +50,7 @@ jobs: fmt: name: Rustfmt - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - name: Checkout branch uses: actions/checkout@v2 @@ -65,7 +65,7 @@ jobs: clippy: name: Clippy - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - name: Checkout branch uses: actions/checkout@v2