From fb972c5ed1133d1af953401581b7b8cba56bcf44 Mon Sep 17 00:00:00 2001 From: daywalker90 Date: Sun, 26 Jul 2026 13:14:09 +0200 Subject: [PATCH] CI: use specific python versions per CLN version --- .github/workflows/ci.yml | 24 ++++++++++--------- .github/workflows/latest_v25.05.yml | 14 ----------- .github/workflows/latest_v25.09.yml | 6 +++-- .github/workflows/latest_v25.12.yml | 8 ++++--- .github/workflows/latest_v26.04.yml | 2 ++ .github/workflows/latest_v26.06.yml | 16 +++++++++++++ .github/workflows/master_v25.09.yml | 6 +++-- .github/workflows/master_v25.12.yml | 6 +++-- .github/workflows/master_v26.04.yml | 2 ++ .../{master_v25.05.yml => master_v26.06.yml} | 8 ++++--- .github/workflows/release.yml | 12 ---------- 11 files changed, 55 insertions(+), 49 deletions(-) delete mode 100644 .github/workflows/latest_v25.05.yml create mode 100644 .github/workflows/latest_v26.06.yml rename .github/workflows/{master_v25.05.yml => master_v26.06.yml} (70%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5275ba9..b15911b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,12 @@ on: tagged-release: required: true type: boolean + python-version-1: + required: true + type: string + python-version-2: + required: true + type: string jobs: build: @@ -27,7 +33,7 @@ jobs: bitcoind-version: ["31.0"] experimental: [1] deprecated: [0] - python-version: ["3.10", "3.14"] + python-version: [ "${{ inputs.python-version-1 }}", "${{ inputs.python-version-2 }}"] os: ["ubuntu-latest"] runs-on: ${{ matrix.os }} @@ -119,25 +125,21 @@ jobs: key: ${{ steps.cache-cln.outputs.cache-primary-key }} - name: Set up Rust - if: ${{ inputs.tagged-release == false}} + if: ${{ inputs.tagged-release == false }} uses: dtolnay/rust-toolchain@stable - - name: Set up protoc - if: ${{ inputs.tagged-release == false}} - uses: arduino/setup-protoc@v3 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - - name: Install cargo-binstall - if: ${{ inputs.tagged-release == false}} + if: ${{ inputs.tagged-release == false }} uses: taiki-e/install-action@cargo-binstall - name: Install cargo-msrv - if: ${{ inputs.tagged-release == false}} + if: ${{ inputs.tagged-release == false }} + env: + GITHUB_TOKEN: ${{ github.token }} run: cargo binstall --no-confirm cargo-msrv - name: Verify MSRV - if: ${{ inputs.tagged-release == false}} + if: ${{ inputs.tagged-release == false }} run: cargo msrv verify - name: Get plugin binary diff --git a/.github/workflows/latest_v25.05.yml b/.github/workflows/latest_v25.05.yml deleted file mode 100644 index b5502c9..0000000 --- a/.github/workflows/latest_v25.05.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Latest release on CLN v25.05.x - -on: - release: - types: [published, edited] - workflow_dispatch: - -jobs: - call-ci: - uses: ./.github/workflows/ci.yml - with: - cln-version: "v25.05" - pyln-version: "25.5" - tagged-release: true \ No newline at end of file diff --git a/.github/workflows/latest_v25.09.yml b/.github/workflows/latest_v25.09.yml index 2926b68..d96d48d 100644 --- a/.github/workflows/latest_v25.09.yml +++ b/.github/workflows/latest_v25.09.yml @@ -9,6 +9,8 @@ jobs: call-ci: uses: ./.github/workflows/ci.yml with: - cln-version: "v25.09.2" - pyln-version: "25.9.2" + cln-version: "v25.09.3" + pyln-version: "25.9.3" tagged-release: true + python-version-1: "3.10" + python-version-2: "3.12" diff --git a/.github/workflows/latest_v25.12.yml b/.github/workflows/latest_v25.12.yml index 268f5f6..3a86b18 100644 --- a/.github/workflows/latest_v25.12.yml +++ b/.github/workflows/latest_v25.12.yml @@ -9,6 +9,8 @@ jobs: call-ci: uses: ./.github/workflows/ci.yml with: - cln-version: "v25.12" - pyln-version: "25.12" - tagged-release: true \ No newline at end of file + cln-version: "v25.12.1" + pyln-version: "25.12.1" + tagged-release: true + python-version-1: "3.10" + python-version-2: "3.12" diff --git a/.github/workflows/latest_v26.04.yml b/.github/workflows/latest_v26.04.yml index f545ca4..a0dc3a0 100644 --- a/.github/workflows/latest_v26.04.yml +++ b/.github/workflows/latest_v26.04.yml @@ -12,3 +12,5 @@ jobs: cln-version: "v26.04" pyln-version: "26.4" tagged-release: true + python-version-1: "3.10" + python-version-2: "3.12" diff --git a/.github/workflows/latest_v26.06.yml b/.github/workflows/latest_v26.06.yml new file mode 100644 index 0000000..27edc2d --- /dev/null +++ b/.github/workflows/latest_v26.06.yml @@ -0,0 +1,16 @@ +name: Latest release on CLN v26.06.x + +on: + release: + types: [published, edited] + workflow_dispatch: + +jobs: + call-ci: + uses: ./.github/workflows/ci.yml + with: + cln-version: "v26.06.6" + pyln-version: "26.6.6" + tagged-release: true + python-version-1: "3.10" + python-version-2: "3.14" diff --git a/.github/workflows/master_v25.09.yml b/.github/workflows/master_v25.09.yml index 7b62c39..1a73ecd 100644 --- a/.github/workflows/master_v25.09.yml +++ b/.github/workflows/master_v25.09.yml @@ -19,6 +19,8 @@ jobs: call-ci: uses: ./.github/workflows/ci.yml with: - cln-version: "v25.09.2" - pyln-version: "25.9.2" + cln-version: "v25.09.3" + pyln-version: "25.9.3" tagged-release: false + python-version-1: "3.10" + python-version-2: "3.12" diff --git a/.github/workflows/master_v25.12.yml b/.github/workflows/master_v25.12.yml index 5df85d3..7e0ae62 100644 --- a/.github/workflows/master_v25.12.yml +++ b/.github/workflows/master_v25.12.yml @@ -19,6 +19,8 @@ jobs: call-ci: uses: ./.github/workflows/ci.yml with: - cln-version: "v25.12" - pyln-version: "25.12" + cln-version: "v25.12.1" + pyln-version: "25.12.1" tagged-release: false + python-version-1: "3.10" + python-version-2: "3.12" diff --git a/.github/workflows/master_v26.04.yml b/.github/workflows/master_v26.04.yml index 5fcd616..82715be 100644 --- a/.github/workflows/master_v26.04.yml +++ b/.github/workflows/master_v26.04.yml @@ -22,3 +22,5 @@ jobs: cln-version: "v26.04" pyln-version: "26.4" tagged-release: false + python-version-1: "3.10" + python-version-2: "3.12" diff --git a/.github/workflows/master_v25.05.yml b/.github/workflows/master_v26.06.yml similarity index 70% rename from .github/workflows/master_v25.05.yml rename to .github/workflows/master_v26.06.yml index dfd753c..25fe3a8 100644 --- a/.github/workflows/master_v25.05.yml +++ b/.github/workflows/master_v26.06.yml @@ -1,4 +1,4 @@ -name: master on CLN v25.05.x +name: master on CLN v26.06.x on: push: @@ -19,6 +19,8 @@ jobs: call-ci: uses: ./.github/workflows/ci.yml with: - cln-version: "v25.05" - pyln-version: "25.5" + cln-version: "v26.06.6" + pyln-version: "26.6.6" tagged-release: false + python-version-1: "3.10" + python-version-2: "3.14" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 56b76c8..6fef945 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,12 +25,6 @@ jobs: sudo apt update sudo apt install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf - - name: Install Protoc - uses: arduino/setup-protoc@v3 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - version: "21.12" - - name: Build Linux binaries (release) run: | cargo build --profile optimized --locked --target x86_64-unknown-linux-gnu @@ -70,12 +64,6 @@ jobs: with: targets: x86_64-apple-darwin, aarch64-apple-darwin - - name: Install Protoc - uses: arduino/setup-protoc@v3 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - version: "21.12" - - name: Build macOS universal (release) id: build env: