From 0e3b7fc9564a6515b66e51943af2ff83f9403207 Mon Sep 17 00:00:00 2001 From: Milap Sheth Date: Wed, 18 Oct 2023 12:07:33 -0400 Subject: [PATCH 1/6] fix: pin rustc 1.72 (#321) * fix: pin rustc 1.72 * chore: rust 1.73.0 --------- Co-authored-by: RiceAndmeet --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index caf53edf..6b8871ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:experimental -FROM rust:latest as builder +FROM rust:1.73.0-bullseye as builder RUN set -ex \ && apt-get update \ From d21c657a74e3acad3684a7602f6f7b7876e659f3 Mon Sep 17 00:00:00 2001 From: Talal Ashraf Date: Thu, 30 May 2024 12:15:13 -0400 Subject: [PATCH 2/6] chore: upgrade macos runner --- .github/workflows/lint.yaml | 3 +-- .github/workflows/test.yaml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 29a5ac45..3b8ef6fc 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -8,8 +8,7 @@ jobs: strategy: matrix: os: - # - ubuntu-18.04 - - macos-10.15 + - macos-13 runs-on: ${{ matrix.os }} steps: - name: Checkout code and submodule diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 42071750..8557e749 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -8,8 +8,7 @@ jobs: strategy: matrix: os: - # - ubuntu-18.04 - - macos-10.15 + - macos-13 runs-on: ${{ matrix.os }} steps: - name: Checkout code and submodule From 802c1b94d23f218b2140f7e275e52e8237729c84 Mon Sep 17 00:00:00 2001 From: Talal Ashraf Date: Thu, 30 May 2024 12:20:34 -0400 Subject: [PATCH 3/6] chore: lock tofnd version to 1.73 for tests and linting --- .github/workflows/lint.yaml | 2 +- .github/workflows/test.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 3b8ef6fc..58d9c937 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -24,7 +24,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable + toolchain: 1.73.0 override: true components: rustfmt, clippy diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 8557e749..2c8082c8 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -24,7 +24,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable + toolchain: 1.73.0 override: true - name: Run cargo test From aa996a14eb91897de98d6afb2ebd8fde06c65127 Mon Sep 17 00:00:00 2001 From: Talal Ashraf Date: Thu, 30 May 2024 12:27:58 -0400 Subject: [PATCH 4/6] chore: add rustfmt to test workflow --- .github/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 2c8082c8..87747b28 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -26,6 +26,7 @@ jobs: profile: minimal toolchain: 1.73.0 override: true + components: rustfmt, clippy - name: Run cargo test run: cargo test --release --all-features From a08fba210a96d7e4eaf9ce6727678eb529fb4b2c Mon Sep 17 00:00:00 2001 From: Talal Ashraf Date: Thu, 30 May 2024 14:12:17 -0400 Subject: [PATCH 5/6] chore: try 1.77.2 --- .github/workflows/format.yaml | 2 +- .github/workflows/lint.yaml | 2 +- .github/workflows/test.yaml | 2 +- Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index 39559da1..e42020a4 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -25,7 +25,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable + toolchain: 1.77.2 override: true components: rustfmt, clippy diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 58d9c937..62a84397 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -24,7 +24,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.73.0 + toolchain: 1.77.2 override: true components: rustfmt, clippy diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 87747b28..8300f655 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -24,7 +24,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.73.0 + toolchain: 1.77.2 override: true components: rustfmt, clippy diff --git a/Dockerfile b/Dockerfile index 6b8871ba..aea74316 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:experimental -FROM rust:1.73.0-bullseye as builder +FROM rust:1.77.2-bullseye as builder RUN set -ex \ && apt-get update \ From ef7d43a807a58445ec0c38b273f90565a689ccb3 Mon Sep 17 00:00:00 2001 From: Talal Ashraf Date: Thu, 30 May 2024 14:22:07 -0400 Subject: [PATCH 6/6] chore: revert to 1.58 --- .github/workflows/format.yaml | 9 ++------- .github/workflows/lint.yaml | 8 ++------ .github/workflows/test.yaml | 8 ++------ Dockerfile | 2 +- 4 files changed, 7 insertions(+), 20 deletions(-) diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index e42020a4..969a03fb 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -5,12 +5,7 @@ on: jobs: format: - strategy: - matrix: - os: - # - ubuntu-18.04 - - macos-10.15 - runs-on: ${{ matrix.os }} + runs-on: macos-13 steps: - name: Checkout code uses: actions/checkout@v2 @@ -25,7 +20,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.77.2 + toolchain: 1.58.1 override: true components: rustfmt, clippy diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 62a84397..cd3b0e15 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -5,11 +5,7 @@ on: jobs: lint: - strategy: - matrix: - os: - - macos-13 - runs-on: ${{ matrix.os }} + runs-on: macos-13 steps: - name: Checkout code and submodule uses: actions/checkout@v2 @@ -24,7 +20,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.77.2 + toolchain: 1.58.1 override: true components: rustfmt, clippy diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 8300f655..5a8f7338 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -5,11 +5,7 @@ on: jobs: test: - strategy: - matrix: - os: - - macos-13 - runs-on: ${{ matrix.os }} + runs-on: macos-13 steps: - name: Checkout code and submodule uses: actions/checkout@v2 @@ -24,7 +20,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.77.2 + toolchain: 1.58.1 override: true components: rustfmt, clippy diff --git a/Dockerfile b/Dockerfile index aea74316..e147ddbe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:experimental -FROM rust:1.77.2-bullseye as builder +FROM rust:1.58.1-bullseye as builder RUN set -ex \ && apt-get update \