From 58e35860cf3e149bc37e523ca6673055f9e0df38 Mon Sep 17 00:00:00 2001 From: Tyler Wilding Date: Mon, 25 Nov 2024 14:43:52 -0500 Subject: [PATCH] ci: update minimum macOS supported version to Ventura (13) (#624) macOS 12 has been end of life for 2 months, GitHub is removing support for the images very soon (within a week or so). https://endoflife.date/macos --- .github/workflows/build.yaml | 2 +- .github/workflows/release.yaml | 2 +- schemas/README.md | 2 +- .../mod-source/v1/mod-source-schema.v1.json | 52 ++++--------------- schemas/mod-source/v1/types.ts | 4 +- .../v1/texture-pack-schema.v1.json | 9 +--- 6 files changed, 16 insertions(+), 55 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 04a29c0c..6b398879 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [ubuntu-20.04, windows-latest, macos-12] + platform: [ubuntu-20.04, windows-latest, macos-13] runs-on: ${{ matrix.platform }} steps: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 18f7d8e5..7ae80625 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -112,7 +112,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [ubuntu-20.04, windows-latest, macos-12] + platform: [ubuntu-20.04, windows-latest, macos-13] runs-on: ${{ matrix.platform }} steps: # NOTE - there is technically a race condition here if multiple releases go out diff --git a/schemas/README.md b/schemas/README.md index d392ea94..08682d3d 100644 --- a/schemas/README.md +++ b/schemas/README.md @@ -4,4 +4,4 @@ Generated via typescript definitions: npx ts-json-schema-generator --path './*.ts' --type 'ModMetadata' > mod-schema.v1.json ``` -And then some value validations added on mostly for valid semver checking \ No newline at end of file +And then some value validations added on mostly for valid semver checking diff --git a/schemas/mod-source/v1/mod-source-schema.v1.json b/schemas/mod-source/v1/mod-source-schema.v1.json index 8a170724..3bb3f89c 100644 --- a/schemas/mod-source/v1/mod-source-schema.v1.json +++ b/schemas/mod-source/v1/mod-source-schema.v1.json @@ -50,12 +50,7 @@ }, "supportedGames": { "items": { - "enum": [ - "jak1", - "jak2", - "jak3", - "jakx" - ], + "enum": ["jak1", "jak2", "jak3", "jakx"], "type": "string" }, "type": "array" @@ -75,10 +70,7 @@ "properties": { "assets": { "additionalProperties": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "type": "object" }, @@ -87,12 +79,7 @@ }, "supportedGames": { "items": { - "enum": [ - "jak1", - "jak2", - "jak3", - "jakx" - ], + "enum": ["jak1", "jak2", "jak3", "jakx"], "type": "string" }, "type": "array" @@ -101,11 +88,7 @@ "type": "string" } }, - "required": [ - "version", - "publishedDate", - "assets" - ], + "required": ["version", "publishedDate", "assets"], "type": "object" }, "type": "array" @@ -176,12 +159,7 @@ }, "supportedGames": { "items": { - "enum": [ - "jak1", - "jak2", - "jak3", - "jakx" - ], + "enum": ["jak1", "jak2", "jak3", "jakx"], "type": "string" }, "type": "array" @@ -201,10 +179,7 @@ "properties": { "assets": { "additionalProperties": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "type": "object" }, @@ -213,12 +188,7 @@ }, "supportedGames": { "items": { - "enum": [ - "jak1", - "jak2", - "jak3", - "jakx" - ], + "enum": ["jak1", "jak2", "jak3", "jakx"], "type": "string" }, "type": "array" @@ -227,11 +197,7 @@ "type": "string" } }, - "required": [ - "version", - "publishedDate", - "assets" - ], + "required": ["version", "publishedDate", "assets"], "type": "object" }, "type": "array" @@ -263,4 +229,4 @@ "type": "object" } } -} \ No newline at end of file +} diff --git a/schemas/mod-source/v1/types.ts b/schemas/mod-source/v1/types.ts index 11bf2af8..9f87f479 100644 --- a/schemas/mod-source/v1/types.ts +++ b/schemas/mod-source/v1/types.ts @@ -37,6 +37,6 @@ export interface ModSourceData { schemaVersion: Semver; sourceName: string; lastUpdated: string; - mods: Record - texturePacks: Record + mods: Record; + texturePacks: Record; } diff --git a/schemas/texture-packs/v1/texture-pack-schema.v1.json b/schemas/texture-packs/v1/texture-pack-schema.v1.json index 06c2fdba..edf62178 100644 --- a/schemas/texture-packs/v1/texture-pack-schema.v1.json +++ b/schemas/texture-packs/v1/texture-pack-schema.v1.json @@ -24,12 +24,7 @@ }, "supportedGames": { "items": { - "enum": [ - "jak1", - "jak2", - "jak3", - "jakx" - ], + "enum": ["jak1", "jak2", "jak3", "jakx"], "type": "string" }, "type": "array" @@ -59,4 +54,4 @@ "type": "object" } } -} \ No newline at end of file +}