From 5be3b6a62ed3f0ae2b1c690838d876a9cfd347e6 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 3 Nov 2022 21:50:20 -0700 Subject: [PATCH] update templates for openbsd-7 --- .github/workflows/ci.yml | 10 +++++----- .github/workflows/templates/generate.py | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 750f6ee..dbc12c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -145,16 +145,16 @@ jobs: instances: '["git-master", "latest"]' - openbsd-6: - name: OpenBSD 6 + openbsd-7: + name: OpenBSD 7 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' uses: ./.github/workflows/test-bsd.yml needs: - lint - generate-actions-workflow with: - distro-slug: openbsd-6 - display-name: OpenBSD 6 + distro-slug: openbsd-7 + display-name: OpenBSD 7 timeout: 20 runs-on: macos-10.15 instances: '["latest"]' @@ -528,7 +528,7 @@ jobs: - generate-actions-workflow - freebsd-131 - freebsd-123 - - openbsd-6 + - openbsd-7 - macos-1015 - macos-11 - macos-12 diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index ab000e6..c64b28b 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -42,7 +42,7 @@ OSX = [ BSD = [ "freebsd-131", "freebsd-123", - "openbsd-6", + "openbsd-7", ] STABLE_DISTROS = [ @@ -168,7 +168,7 @@ DISTRO_DISPLAY_NAMES = { "macos-12": "macOS 12", "freebsd-131": "FreeBSD 13.1", "freebsd-123": "FreeBSD 12.3", - "openbsd-6": "OpenBSD 6", + "openbsd-7": "OpenBSD 7", "windows-2019": "Windows 2019", "windows-2022": "Windows 2022", } @@ -223,7 +223,7 @@ def generate_test_jobs(): instances.append(salt_version) continue - if distro == "openbsd-6": + if distro == "openbsd-7": # Only test latest on OpenBSD 6 continue