From afc3f46ef86533296886d1b6084e2fddd38c772b Mon Sep 17 00:00:00 2001
From: Florian Loitsch <florian@loitsch.com>
Date: Fri, 2 Oct 2026 18:10:26 +0200
Subject: [PATCH] GitHub workflow maintenance

---
 .github/workflows/ci.yml      | 22 +++++++++++++++++-----
 .github/workflows/publish.yml |  2 +-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e36081b..8654c3a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,6 +2,7 @@ name: CI
 
 on:
   push:
+  pull_request:
   release:
     types: [published]
 
@@ -10,11 +11,9 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
-        # The versions should contain (at least) the lowest requirement
-        #    and a version that is more up to date.
-        toit-version: [ v2.0.0-alpha.190, latest ]
+        toit-version: [ oldest, latest ]
         include:
-          - toit-version: v2.0.0-alpha.190
+          - toit-version: oldest
             version-name: old
           - toit-version: latest
             version-name: new
@@ -26,9 +25,22 @@ jobs:
     steps:
       - uses: actions/checkout@v7
 
+      - name: Resolve Toit version
+        id: toit-version
+        shell: bash
+        run: |
+          if [[ "${{ matrix.toit-version }}" == "oldest" ]]; then
+            sdk=$(grep -E '^[[:space:]]+sdk:' package.yaml | head -1 \
+              | sed -E 's/^[[:space:]]+sdk:[[:space:]]*//; s/^\^//' \
+              | tr -d "\"' ")
+            echo "version=v$sdk" >> "$GITHUB_OUTPUT"
+          else
+            echo "version=latest" >> "$GITHUB_OUTPUT"
+          fi
+
       - uses: toitlang/action-setup@v1
         with:
-          toit-version: ${{ matrix.toit-version }}
+          toit-version: ${{ steps.toit-version.outputs.version }}
 
       - name: Start httpbin - Linux
         if: runner.os == 'Linux'
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 4f1dd0d..0821528 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -11,4 +11,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Publish
-        uses: toitlang/pkg-publish@v1.5.0
+        uses: toitlang/action-publish@v1.5.0