From 2dca2254d0ae9b836f3687df57d640db0fe55ab0 Mon Sep 17 00:00:00 2001 From: Ollie Treend Date: Wed, 10 Apr 2024 15:55:09 +0100 Subject: [PATCH 1/3] Allow CI workflow to be run manually --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa68a59..eb9506a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,6 @@ name: proj4rb -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] jobs: proj_8: From 0b6d814ce1b9e62ca58d0e9892e7d61014b90221 Mon Sep 17 00:00:00 2001 From: Ollie Treend Date: Wed, 10 Apr 2024 15:57:57 +0100 Subject: [PATCH 2/3] Test on macOS hosted runners Run tests on macos-13 (Intel) and macos-14 (Apple Silicon). --- .github/workflows/ci.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb9506a..82f9eb2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,22 +3,30 @@ name: proj4rb on: [push, pull_request, workflow_dispatch] jobs: - proj_8: + test: strategy: fail-fast: false matrix: - os: [ubuntu-22.04] + os: [ubuntu-22.04, macos-13, macos-14] ruby: [3.2, 3.3] runs-on: ${{matrix.os}} steps: - name: Checkout uses: actions/checkout@v4 - - name: Install Proj - run: sudo apt-get install libproj22 + - name: Install Proj (Ubuntu) + if: startsWith(matrix.os, 'ubuntu') + run: | + sudo apt-get update + sudo apt-get install libproj22 + - name: Install Proj (Mac) + if: startsWith(matrix.os, 'macos') + run: | + brew update + brew install proj - name: Set up Ruby uses: ruby/setup-ruby@v1 with: ruby-version: ${{matrix.ruby}} bundler-cache: true - name: Test - run: bundle exec rake test \ No newline at end of file + run: bundle exec rake test From f51f7fbad939f6ee42acb53a4204c20798af563d Mon Sep 17 00:00:00 2001 From: Ollie Treend Date: Wed, 10 Apr 2024 16:37:11 +0100 Subject: [PATCH 3/3] Show the CPU architecture of the runner --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 82f9eb2..1b1a27c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - name: CPU architecture + run: uname -p - name: Install Proj (Ubuntu) if: startsWith(matrix.os, 'ubuntu') run: |