From ee73dcf1b32f5718b79033a178ce81e48a746308 Mon Sep 17 00:00:00 2001 From: Gustav Behm Date: Thu, 11 Apr 2024 12:18:55 +0200 Subject: [PATCH] Add OpenBSD 7.5 --- .github/workflows/tests.yaml | 12 ++++++------ openbsd | 28 ++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 011972d..89dd12e 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -40,7 +40,7 @@ jobs: - deps strategy: matrix: - version: [ 7.3, 7.4 ] + version: [ 7.3, 7.4, 7.5 ] arch: [ amd64, i386 ] runs-on: ubuntu-latest container: @@ -60,7 +60,7 @@ jobs: - name: Cache OpenBSD files id: cache-openbsd - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.OPENBSD_CACHE }} key: openbsd-${{ matrix.version }}-${{ matrix.arch }}-${{ github.job }} @@ -74,7 +74,7 @@ jobs: run: tests/base -v ${{ matrix.version }} -a ${{ matrix.arch }} - name: Keep artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() with: name: ${{ github.job }}-${{ matrix.version }}-${{ matrix.arch }}-${{github.run_id}}-${{github.run_number}}-${{github.run_attempt}} @@ -88,7 +88,7 @@ jobs: - base strategy: matrix: - version: [ 7.4 ] + version: [ 7.5 ] arch: [ amd64 ] runs-on: ubuntu-latest env: @@ -109,7 +109,7 @@ jobs: - name: Cache OpenBSD files id: cache-openbsd - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.OPENBSD_CACHE }} key: openbsd-${{ matrix.version }}-${{ matrix.arch }}-${{ github.job }} @@ -123,7 +123,7 @@ jobs: run: tests/example -v ${{ matrix.version }} -a ${{ matrix.arch }} - name: Keep artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() with: name: ${{ github.job }}-${{ matrix.version }}-${{ matrix.arch }}-${{github.run_id}}-${{github.run_number}}-${{github.run_attempt}} diff --git a/openbsd b/openbsd index 2345419..1e3c567 100755 --- a/openbsd +++ b/openbsd @@ -77,20 +77,19 @@ class Version: return DEFAULT_VERSION return cls.versions.get(version) -Version.add( - version = "7.3", +DEFAULT_VERSION = Version.add( + version = "7.5", pub = lines( - "untrusted comment: openbsd 7.3 public key", - "RWQS90bYzZ4XFms5z9OodrFABHMQnW6htU+4Tmp88NuQiTEezMm2cQ3K", + "untrusted comment: openbsd 7.5 public key", + "RWRGj1pRpprAfgeF/rgld4ubduChLvTkigA1Zj7WLDsVA4qfYSWOEI8q", ), archs = { - "amd64": "d04aa5c346a7e327469119072137c393d4412979f9e6f950c144e99a36c812b4", - "i386": "304f0fa30f24aac031a625e6e7e8b72d3be3f9b19df0d60976888927aa663741", - "arm64": "da8cc4eb51499989e4f073726f06b8070ea125266bf60be95833779a1061810e", + "amd64": "2b368dc0f2f486ffd04161db1898f7cdcf84dec9f2c0fe4db1b75dd69f979db7", + "i386": "0601f4561a479094b24c9d72176a6bba027af55cb92ecd3f5fea9ac6dbe6c803", }, ) -DEFAULT_VERSION = Version.add( +Version.add( version = "7.4", pub = lines( "untrusted comment: openbsd 7.4 public key", @@ -104,6 +103,19 @@ DEFAULT_VERSION = Version.add( }, ) +Version.add( + version = "7.3", + pub = lines( + "untrusted comment: openbsd 7.3 public key", + "RWQS90bYzZ4XFms5z9OodrFABHMQnW6htU+4Tmp88NuQiTEezMm2cQ3K", + ), + archs = { + "amd64": "d04aa5c346a7e327469119072137c393d4412979f9e6f950c144e99a36c812b4", + "i386": "304f0fa30f24aac031a625e6e7e8b72d3be3f9b19df0d60976888927aa663741", + "arm64": "da8cc4eb51499989e4f073726f06b8070ea125266bf60be95833779a1061810e", + }, +) + def env(var, default=None): return os.environ.get(f"{whoami.upper()}_" + var, default)