From 27174ba72c16b53d7ff630ad07bcdeb5e57da7c1 Mon Sep 17 00:00:00 2001 From: Mark Date: Sun, 4 May 2025 10:49:07 -0700 Subject: [PATCH 1/3] Fix build? --- .gitea/workflows/ci.yml | 4 ++-- .gitea/workflows/release.yml | 5 +++++ Cargo.lock | 2 +- Cargo.toml | 2 +- toolchain.toml | 2 ++ 5 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 toolchain.toml diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 289f812..f48727e 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -29,7 +29,6 @@ jobs: sudo apt update DEBIAN_FRONTEND=noninteractive \ sudo apt install --yes rustup - rustup default stable - name: Run clippy run: cargo clippy --all-targets --all-features @@ -45,7 +44,6 @@ jobs: sudo apt update DEBIAN_FRONTEND=noninteractive \ sudo apt install --yes rustup - rustup default stable - name: Build run: cargo build --release @@ -56,6 +54,8 @@ jobs: check-version: name: Check version runs-on: ubuntu-latest + # Skip this job on push to main + if: github.event_name != 'push' || github.ref != 'refs/heads/main' steps: - uses: actions/checkout@v4 with: diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 455eb99..a591931 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -14,6 +14,11 @@ jobs: with: fetch-depth: 0 + - name: setup go + uses: https://github.com/actions/setup-go@v4 + with: + go-version: ">=1.20.1" + - uses: https://gitea.com/actions/release-action@main with: api_key: "${{secrets.RELEASE_TOKEN}}" diff --git a/Cargo.lock b/Cargo.lock index 10e89e1..919613f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -306,7 +306,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pick" -version = "0.0.4" +version = "0.0.5" dependencies = [ "anstyle", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index a0f0ba6..aff8016 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pick" -version = "0.0.4" +version = "0.0.5" edition = "2024" # diff --git a/toolchain.toml b/toolchain.toml new file mode 100644 index 0000000..cf6d0f5 --- /dev/null +++ b/toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "1.86.0" -- 2.49.0 From a9f299e907daca66c4fc4dfe196854efe781f54d Mon Sep 17 00:00:00 2001 From: Mark Date: Sun, 4 May 2025 10:50:39 -0700 Subject: [PATCH 2/3] rust --- .gitea/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index f48727e..e4edb7c 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -28,7 +28,8 @@ jobs: run: | sudo apt update DEBIAN_FRONTEND=noninteractive \ - sudo apt install --yes rustup + sudo apt install --yes rustup \ + rustup default 1.86.0 - name: Run clippy run: cargo clippy --all-targets --all-features @@ -43,7 +44,8 @@ jobs: run: | sudo apt update DEBIAN_FRONTEND=noninteractive \ - sudo apt install --yes rustup + sudo apt install --yes rustup \ + rustup default 1.86.0 - name: Build run: cargo build --release -- 2.49.0 From 9cc799c385b4f28ae762d8e05f3089fc9350a46d Mon Sep 17 00:00:00 2001 From: Mark Date: Sun, 4 May 2025 10:51:43 -0700 Subject: [PATCH 3/3] version --- .gitea/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index e4edb7c..bd380bf 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: sudo apt update DEBIAN_FRONTEND=noninteractive \ sudo apt install --yes rustup \ - rustup default 1.86.0 + rustup default stable - name: Run clippy run: cargo clippy --all-targets --all-features @@ -45,7 +45,7 @@ jobs: sudo apt update DEBIAN_FRONTEND=noninteractive \ sudo apt install --yes rustup \ - rustup default 1.86.0 + rustup default stable - name: Build run: cargo build --release -- 2.49.0