Add 5.7 and update to 5.6.3

apple · Sep 14, 2022 · 55b9319 · 55b9319
1 parent e5b7cb7
commit 55b9319
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,14 +15,18 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- swift: ["5.6.2", "5.5.3", "5.4.3", "5.3.3", "5.2.5", "5.1.5", "5.0.3", "4.2.4"]
+ swift: ["5.7.0", "5.6.3", "5.5.3", "5.4.3", "5.3.3", "5.2.5", "5.1.5", "5.0.3", "4.2.4"]
  # protobuf_git can reference a commit, tag, or branch
  # commit: "commits/6935eae45c99926a000ecbef0be20dfd3d159e71"
  # tag: "ref/tags/v3.11.4"
  # branch: "ref/heads/main"
  protobuf_git: ["ref/heads/main"]
  include:
- - swift: 5.6.2
+ - swift: 5.7.0
+ ubuntu: -focal
+ generate_linux_main: false
+ update_git: false
+ - swift: 5.6.3
  ubuntu: -focal
  generate_linux_main: false
  update_git: false

diff --git a/.github/workflows/regular_conformance.yml b/.github/workflows/regular_conformance.yml
@@ -17,20 +17,23 @@ on:
  schedule:
  # Every Sunday at 5am.
  - cron: '0 5 * * 0'
+ # Also allow manual triggering from the github UX to revalidate things.
+ workflow_dispatch:
 
 jobs:
  build:
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-latest
  strategy:
  matrix:
- swift: ["5.5-bionic"]
+ swift: ["5.7.0"]
+ ubuntu: ["focal"]
  # protobuf_git can reference a commit, tag, or branch
  # commit: "commits/6935eae45c99926a000ecbef0be20dfd3d159e71"
  # tag: "ref/tags/v3.11.4"
  # branch: "ref/heads/main"
  protobuf_git: ["ref/heads/main"]
  container:
- image: swift:${{ matrix.swift }}
+ image: swift:${{ matrix.swift }}-${{ matrix.ubuntu }}
  steps:
  - name: Checkout
  uses: actions/checkout@v2