From a426c11cb19f49d12cb3fa4d8f2a781b65066c67 Mon Sep 17 00:00:00 2001 From: levisyin <150114626+levisyin@users.noreply.github.com> Date: Mon, 15 Jan 2024 10:21:12 +0800 Subject: [PATCH 1/6] refactor: get fuel-core version from an env variable --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 323aaf9070f..85ba0b43362 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,7 @@ env: REGISTRY: ghcr.io RUST_VERSION: 1.75.0 NIGHTLY_RUST_VERSION: nightly-2023-12-27 + FUEL_CORE_VERSION: 0.22.0 jobs: build-sway-lib-core: @@ -280,7 +281,7 @@ jobs: runs-on: ubuntu-latest services: fuel-core: - image: ghcr.io/fuellabs/fuel-core:v0.22.0 + image: ghcr.io/fuellabs/fuel-core:${{ env.FUEL_CORE_VERSION }} ports: - 4000:4000 steps: @@ -430,7 +431,7 @@ jobs: uses: baptiste0928/cargo-install@v2 with: crate: fuel-core-bin - version: "0.22" + version: ${{ env.FUEL_CORE_VERSION }} - uses: Swatinem/rust-cache@v2 - name: Run tests run: cargo test --locked --release From 9e63719eb19c9876e52083c1a141d250666d8e78 Mon Sep 17 00:00:00 2001 From: levisyin Date: Wed, 17 Jan 2024 11:11:58 +0800 Subject: [PATCH 2/6] update ci --- .github/workflows/ci.yml | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 85ba0b43362..ee0c0691a68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,9 +17,28 @@ env: REGISTRY: ghcr.io RUST_VERSION: 1.75.0 NIGHTLY_RUST_VERSION: nightly-2023-12-27 - FUEL_CORE_VERSION: 0.22.0 jobs: + init-fuel-core-version-env: + runs-on: ubuntu-latest + outputs: + furl_core_version: ${{steps.get_fuel_core_ver.outputs.version}} + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Install toolchain + uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{ env.RUST_VERSION }} + + - name: get fuel core version + id: get_fuel_core_ver + run: | + cargo install toml-cli + version=$(toml get Cargo.toml workspace.dependencies.fuel-core-client.version | tr -d '"') + echo "version=$version" >> "$GITHUB_OUTPUT" + build-sway-lib-core: runs-on: ubuntu-latest steps: @@ -279,9 +298,10 @@ jobs: cargo-run-e2e-test: runs-on: ubuntu-latest + needs: init-fuel-core-version-env services: fuel-core: - image: ghcr.io/fuellabs/fuel-core:${{ env.FUEL_CORE_VERSION }} + image: ghcr.io/fuellabs/fuel-core:${{ needs.init-fuel-core-version-env.outputs.furl_core_version }} ports: - 4000:4000 steps: @@ -421,6 +441,7 @@ jobs: cargo-test-workspace: runs-on: ubuntu-latest + needs: init-fuel-core-version-env steps: - uses: actions/checkout@v3 - name: Install toolchain @@ -431,7 +452,7 @@ jobs: uses: baptiste0928/cargo-install@v2 with: crate: fuel-core-bin - version: ${{ env.FUEL_CORE_VERSION }} + version: ${{ needs.init-fuel-core-version-env.outputs.furl_core_version }} - uses: Swatinem/rust-cache@v2 - name: Run tests run: cargo test --locked --release From d01cfb356b8c1082e610deefbe91c3696828595a Mon Sep 17 00:00:00 2001 From: levisyin Date: Wed, 17 Jan 2024 12:46:17 +0800 Subject: [PATCH 3/6] refactor: update job name --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee0c0691a68..daadeb3be3e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ env: NIGHTLY_RUST_VERSION: nightly-2023-12-27 jobs: - init-fuel-core-version-env: + get-fuel-core-version: runs-on: ubuntu-latest outputs: furl_core_version: ${{steps.get_fuel_core_ver.outputs.version}} @@ -298,10 +298,10 @@ jobs: cargo-run-e2e-test: runs-on: ubuntu-latest - needs: init-fuel-core-version-env + needs: get-fuel-core-version services: fuel-core: - image: ghcr.io/fuellabs/fuel-core:${{ needs.init-fuel-core-version-env.outputs.furl_core_version }} + image: ghcr.io/fuellabs/fuel-core:${{ needs.get-fuel-core-version.outputs.furl_core_version }} ports: - 4000:4000 steps: @@ -441,7 +441,7 @@ jobs: cargo-test-workspace: runs-on: ubuntu-latest - needs: init-fuel-core-version-env + needs: get-fuel-core-version steps: - uses: actions/checkout@v3 - name: Install toolchain @@ -452,7 +452,7 @@ jobs: uses: baptiste0928/cargo-install@v2 with: crate: fuel-core-bin - version: ${{ needs.init-fuel-core-version-env.outputs.furl_core_version }} + version: ${{ needs.get-fuel-core-version.outputs.furl_core_version }} - uses: Swatinem/rust-cache@v2 - name: Run tests run: cargo test --locked --release From c5e97e8c6f780d96d7aa8f39b00a74cf0652c323 Mon Sep 17 00:00:00 2001 From: levisyin Date: Wed, 17 Jan 2024 23:59:44 +0800 Subject: [PATCH 4/6] Update ci.yml --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index daadeb3be3e..5e07779f110 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,6 +23,7 @@ jobs: runs-on: ubuntu-latest outputs: furl_core_version: ${{steps.get_fuel_core_ver.outputs.version}} + furl_core_version_with_v: ${{steps.get_fuel_core_ver.outputs.version_with_v}} steps: - name: Checkout repository uses: actions/checkout@v3 @@ -38,6 +39,7 @@ jobs: cargo install toml-cli version=$(toml get Cargo.toml workspace.dependencies.fuel-core-client.version | tr -d '"') echo "version=$version" >> "$GITHUB_OUTPUT" + echo "version_with_v=v$version" >> "$GITHUB_OUTPUT" build-sway-lib-core: runs-on: ubuntu-latest @@ -301,7 +303,7 @@ jobs: needs: get-fuel-core-version services: fuel-core: - image: ghcr.io/fuellabs/fuel-core:${{ needs.get-fuel-core-version.outputs.furl_core_version }} + image: ghcr.io/fuellabs/fuel-core:${{ needs.get-fuel-core-version.outputs.furl_core_version_with_v }} ports: - 4000:4000 steps: From 8398d24178879552b580f7d75d3593378e5fb2f8 Mon Sep 17 00:00:00 2001 From: levisyin Date: Thu, 18 Jan 2024 10:19:44 +0800 Subject: [PATCH 5/6] Update ci.yml --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e07779f110..ee28dd49a39 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,6 @@ jobs: runs-on: ubuntu-latest outputs: furl_core_version: ${{steps.get_fuel_core_ver.outputs.version}} - furl_core_version_with_v: ${{steps.get_fuel_core_ver.outputs.version_with_v}} steps: - name: Checkout repository uses: actions/checkout@v3 @@ -39,7 +38,6 @@ jobs: cargo install toml-cli version=$(toml get Cargo.toml workspace.dependencies.fuel-core-client.version | tr -d '"') echo "version=$version" >> "$GITHUB_OUTPUT" - echo "version_with_v=v$version" >> "$GITHUB_OUTPUT" build-sway-lib-core: runs-on: ubuntu-latest @@ -303,7 +301,7 @@ jobs: needs: get-fuel-core-version services: fuel-core: - image: ghcr.io/fuellabs/fuel-core:${{ needs.get-fuel-core-version.outputs.furl_core_version_with_v }} + image: ghcr.io/fuellabs/fuel-core:v${{ needs.get-fuel-core-version.outputs.furl_core_version }} ports: - 4000:4000 steps: From 042bd729d5fd3afb3b1dccfc441a858246cb397f Mon Sep 17 00:00:00 2001 From: levisyin Date: Thu, 18 Jan 2024 19:51:21 +0800 Subject: [PATCH 6/6] fix typo --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee28dd49a39..439b1525123 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: get-fuel-core-version: runs-on: ubuntu-latest outputs: - furl_core_version: ${{steps.get_fuel_core_ver.outputs.version}} + fuel_core_version: ${{steps.get_fuel_core_ver.outputs.version}} steps: - name: Checkout repository uses: actions/checkout@v3 @@ -301,7 +301,7 @@ jobs: needs: get-fuel-core-version services: fuel-core: - image: ghcr.io/fuellabs/fuel-core:v${{ needs.get-fuel-core-version.outputs.furl_core_version }} + image: ghcr.io/fuellabs/fuel-core:v${{ needs.get-fuel-core-version.outputs.fuel_core_version }} ports: - 4000:4000 steps: @@ -452,7 +452,7 @@ jobs: uses: baptiste0928/cargo-install@v2 with: crate: fuel-core-bin - version: ${{ needs.get-fuel-core-version.outputs.furl_core_version }} + version: ${{ needs.get-fuel-core-version.outputs.fuel_core_version }} - uses: Swatinem/rust-cache@v2 - name: Run tests run: cargo test --locked --release