From 47305916f71c711cdef4537e0859a524efeb754d Mon Sep 17 00:00:00 2001 From: Thomas Schorr Date: Wed, 4 Jan 2023 10:21:51 +0100 Subject: [PATCH 1/9] fix build status badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f3f1c6a..e87860f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -rust-cpython [![Build Status](https://travis-ci.org/dgrunwald/rust-cpython.svg?branch=master)](https://travis-ci.org/dgrunwald/rust-cpython) +rust-cpython [![Build Status](https://github.com/dgrunwald/rust-cpython/actions/workflows/test.yml/badge.svg)](https://github.com/dgrunwald/rust-cpython/actions/workflows/test.yml) ==================== [Rust](http://www.rust-lang.org/) bindings for the [python](https://www.python.org/) interpreter. From d08a9618a745f5d42a0254aef7237737195b1375 Mon Sep 17 00:00:00 2001 From: Thomas Schorr Date: Wed, 4 Jan 2023 11:02:54 +0100 Subject: [PATCH 2/9] try allow failure for Rust 1.41.1 --- .github/workflows/test.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b2b1f91..f751d56 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,12 +9,19 @@ on: jobs: unix: runs-on: ${{ matrix.os }} + continue-on-error: ${{ matrix.allowfail }} strategy: + fail-fast: false matrix: os: [ ubuntu-latest, macos-latest ] py: [ "2.7", "3.7", "3.8", "3.9", "3.10", "3.11" ] - rust: [ "1.41.1", "stable", "nightly" ] + rust: [ "stable", "nightly" ] + allowfail: [false] + include: + - rust: "1.41.1" + os: [ ubuntu-latest, macos-latest ] + allowfail: true steps: - name: Checkout code From c12ba0687748ba1964f993559100dc9970b2913e Mon Sep 17 00:00:00 2001 From: Thomas Schorr Date: Wed, 4 Jan 2023 11:24:10 +0100 Subject: [PATCH 3/9] in addition, try using appropriate tag for rust-toolchain --- .github/workflows/test.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f751d56..1aaa93d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,9 +31,7 @@ jobs: with: python-version: ${{ matrix.py }} - name: Setup Rust ${{ matrix.rust }} - uses: dtolnay/rust-toolchain@master - with: - toolchain: ${{ matrix.rust }} + uses: dtolnay/rust-toolchain@${{ matrix.rust }} - name: Check versions and paths run: | python -V ; rustc -V From cf63ee4b6cc9340ebd7a6133545434963a86b48c Mon Sep 17 00:00:00 2001 From: Thomas Schorr Date: Wed, 4 Jan 2023 11:34:23 +0100 Subject: [PATCH 4/9] in addition, try using appropriate tag for rust-toolchain --- .github/workflows/test.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1aaa93d..61ca0ac 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,7 +31,13 @@ jobs: with: python-version: ${{ matrix.py }} - name: Setup Rust ${{ matrix.rust }} - uses: dtolnay/rust-toolchain@${{ matrix.rust }} + if: ${{ matrix.allowfail }} + uses: dtolnay/rust-toolchain@1.41.1 + - name: Setup Rust ${{ matrix.rust }} + if: ${{ ! matrix.allowfail }} + uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{ matrix.rust }} - name: Check versions and paths run: | python -V ; rustc -V From 4a0b9b80df9cd5a4aea117f7b2bfef646e08acde Mon Sep 17 00:00:00 2001 From: Thomas Schorr Date: Wed, 4 Jan 2023 11:39:19 +0100 Subject: [PATCH 5/9] add missing python versions --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 61ca0ac..fbda805 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,6 +21,7 @@ jobs: include: - rust: "1.41.1" os: [ ubuntu-latest, macos-latest ] + py: [ "2.7", "3.7", "3.8", "3.9", "3.10", "3.11" ] allowfail: true steps: From a86e9ee557b7827500003563ea6422b37073405f Mon Sep 17 00:00:00 2001 From: Thomas Schorr Date: Wed, 4 Jan 2023 11:50:06 +0100 Subject: [PATCH 6/9] yet another try --- .github/workflows/test.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fbda805..0fe1743 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,20 +9,12 @@ on: jobs: unix: runs-on: ${{ matrix.os }} - continue-on-error: ${{ matrix.allowfail }} strategy: - fail-fast: false matrix: os: [ ubuntu-latest, macos-latest ] py: [ "2.7", "3.7", "3.8", "3.9", "3.10", "3.11" ] - rust: [ "stable", "nightly" ] - allowfail: [false] - include: - - rust: "1.41.1" - os: [ ubuntu-latest, macos-latest ] - py: [ "2.7", "3.7", "3.8", "3.9", "3.10", "3.11" ] - allowfail: true + rust: [ "1.41.1", "stable", "nightly" ] steps: - name: Checkout code @@ -32,10 +24,10 @@ jobs: with: python-version: ${{ matrix.py }} - name: Setup Rust ${{ matrix.rust }} - if: ${{ matrix.allowfail }} + if: ${{ matrix.rust == "1.41.1" }} uses: dtolnay/rust-toolchain@1.41.1 - name: Setup Rust ${{ matrix.rust }} - if: ${{ ! matrix.allowfail }} + if: ${{ matrix.rust != "1.41.1" }} uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.rust }} From c4aa779ff147aae829f068cf07c5225a7b1a9567 Mon Sep 17 00:00:00 2001 From: Thomas Schorr Date: Wed, 4 Jan 2023 11:51:21 +0100 Subject: [PATCH 7/9] single quotes --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0fe1743..c6012f5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,10 +24,10 @@ jobs: with: python-version: ${{ matrix.py }} - name: Setup Rust ${{ matrix.rust }} - if: ${{ matrix.rust == "1.41.1" }} + if: ${{ matrix.rust == '1.41.1' }} uses: dtolnay/rust-toolchain@1.41.1 - name: Setup Rust ${{ matrix.rust }} - if: ${{ matrix.rust != "1.41.1" }} + if: ${{ matrix.rust != '1.41.1' }} uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.rust }} From 0f924c3871a43e6e1aa5b34dab4220007e22a608 Mon Sep 17 00:00:00 2001 From: Thomas Schorr Date: Wed, 4 Jan 2023 11:57:47 +0100 Subject: [PATCH 8/9] back to allowed failure, list all combinations --- .github/workflows/test.yml | 58 ++++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c6012f5..3457160 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,12 +9,64 @@ on: jobs: unix: runs-on: ${{ matrix.os }} + continue-on-error: ${{ matrix.allowfail }} strategy: + fail-fast: false matrix: os: [ ubuntu-latest, macos-latest ] py: [ "2.7", "3.7", "3.8", "3.9", "3.10", "3.11" ] - rust: [ "1.41.1", "stable", "nightly" ] + rust: [ "stable", "nightly" ] + allowfail: [false] + include: + - rust: "1.41.1" + os: ubuntu-latest + py: "2.7" + allowfail: true + - rust: "1.41.1" + os: ubuntu-latest + py: "3.7" + allowfail: true + - rust: "1.41.1" + os: ubuntu-latest + py: "3.8" + allowfail: true + - rust: "1.41.1" + os: ubuntu-latest + py: "3.9" + allowfail: true + - rust: "1.41.1" + os: ubuntu-latest + py: "3.10" + allowfail: true + - rust: "1.41.1" + os: ubuntu-latest + py: "3.11" + allowfail: true + - rust: "1.41.1" + os: macos-latest + py: "2.7" + allowfail: true + - rust: "1.41.1" + os: macos-latest + py: "3.7" + allowfail: true + - rust: "1.41.1" + os: macos-latest + py: "3.8" + allowfail: true + - rust: "1.41.1" + os: macos-latest + py: "3.9" + allowfail: true + - rust: "1.41.1" + os: macos-latest + py: "3.10" + allowfail: true + - rust: "1.41.1" + os: macos-latest + py: "3.11" + allowfail: true steps: - name: Checkout code @@ -24,10 +76,6 @@ jobs: with: python-version: ${{ matrix.py }} - name: Setup Rust ${{ matrix.rust }} - if: ${{ matrix.rust == '1.41.1' }} - uses: dtolnay/rust-toolchain@1.41.1 - - name: Setup Rust ${{ matrix.rust }} - if: ${{ matrix.rust != '1.41.1' }} uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.rust }} From 7ce8fd25e60cd56f93edf0b1864ad24b52ab6d68 Mon Sep 17 00:00:00 2001 From: Thomas Schorr Date: Wed, 4 Jan 2023 13:11:03 +0100 Subject: [PATCH 9/9] add macos-latest/Rust 1.42.0/Python 3.7 to matrix --- .github/workflows/test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3457160..0a693a0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -67,6 +67,10 @@ jobs: os: macos-latest py: "3.11" allowfail: true + - rust: "1.42.0" + os: macos-latest + py: "3.7" + allowfail: true steps: - name: Checkout code