From 2dfd065395985b39db343d0f315e528c2b8f8f13 Mon Sep 17 00:00:00 2001 From: Ben C Date: Tue, 15 Nov 2022 13:41:24 -0500 Subject: [PATCH 1/5] Update Actions And Stuff --- .github/workflows/build.yaml | 2 +- .github/workflows/update_schemas.yml | 8 +++++--- NewHorizons/External/Configs/PlanetConfig.cs | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0b6d13a3..4ad21011 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -66,7 +66,7 @@ jobs: path: .\NewHorizons\Schemas - name: Verify Changed Schemas - uses: tj-actions/verify-changed-files@v12 + uses: tj-actions/verify-changed-files@v34 id: changed_files with: files: NewHorizons/Schemas/** diff --git a/.github/workflows/update_schemas.yml b/.github/workflows/update_schemas.yml index 35330d9f..6bbf8da7 100644 --- a/.github/workflows/update_schemas.yml +++ b/.github/workflows/update_schemas.yml @@ -19,6 +19,8 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v3 + with: + token: ${{ secrets.SCHEMAS_TOKEN }} - name: Download Artifact uses: actions/download-artifact@v3 @@ -28,13 +30,13 @@ jobs: - name: Commit Schemas run: | - git config --local user.email "github-actions[bot]@users.noreply.github.com" - git config --local user.name "github-actions[bot]" + git config --local user.email "bwc9876@gmail.com" + git config --local user.name "Ben C" git add NewHorizons/Schemas/** git commit -m "Updated Schemas" - name: Push Schemas uses: ad-m/github-push-action@master with: - github_token: ${{ secrets.github_token }} + github_token: ${{ secrets.SCHEMAS_TOKEN }} branch: ${{ github.ref }} diff --git a/NewHorizons/External/Configs/PlanetConfig.cs b/NewHorizons/External/Configs/PlanetConfig.cs index 3c649ebd..ef36bca5 100644 --- a/NewHorizons/External/Configs/PlanetConfig.cs +++ b/NewHorizons/External/Configs/PlanetConfig.cs @@ -11,7 +11,7 @@ using Logger = NewHorizons.Utility.Logger; namespace NewHorizons.External.Configs { /// - /// Describes a body to generate + /// Describes a celestial body to generate /// [JsonObject(Title = "Celestial Body")] public class PlanetConfig From 0acbf68093ccbb3ab99f0550eec55c5bf1c22ff7 Mon Sep 17 00:00:00 2001 From: Ben C Date: Tue, 15 Nov 2022 13:43:55 -0500 Subject: [PATCH 2/5] Update build.yaml --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4ad21011..0b6d13a3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -66,7 +66,7 @@ jobs: path: .\NewHorizons\Schemas - name: Verify Changed Schemas - uses: tj-actions/verify-changed-files@v34 + uses: tj-actions/verify-changed-files@v12 id: changed_files with: files: NewHorizons/Schemas/** From f2cada1d125032c47de3942e5d9dd97a02e80f00 Mon Sep 17 00:00:00 2001 From: Ben C Date: Tue, 15 Nov 2022 13:48:40 -0500 Subject: [PATCH 3/5] Pass Secrets --- .github/workflows/debug_build.yml | 2 ++ .github/workflows/release_build.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml index 587cc772..31e5e966 100644 --- a/.github/workflows/debug_build.yml +++ b/.github/workflows/debug_build.yml @@ -23,3 +23,5 @@ jobs: uses: './.github/workflows/update_schemas.yml' with: artifact_name: NewHorizons-Schemas-Debug + secrets: + SCHEMAS_TOKEN: ${{ secrets.SCHEMAS_TOKEN }} diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml index 57060b79..6d9c7d71 100644 --- a/.github/workflows/release_build.yml +++ b/.github/workflows/release_build.yml @@ -34,6 +34,8 @@ jobs: uses: ./.github/workflows/update_schemas.yml with: artifact_name: NewHorizons-Schemas-Release + secrets: + SCHEMAS_TOKEN: ${{ secrets.SCHEMAS_TOKEN }} Update_Docs: name: 'Update Docs' needs: Build From 95b9c6fc4a70d948c5c4daf52a8d34ba444e013b Mon Sep 17 00:00:00 2001 From: Ben C Date: Tue, 15 Nov 2022 13:51:00 -0500 Subject: [PATCH 4/5] Pass Secrets 2 --- .github/workflows/debug_build.yml | 3 +-- .github/workflows/release_build.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml index 31e5e966..e69d65c4 100644 --- a/.github/workflows/debug_build.yml +++ b/.github/workflows/debug_build.yml @@ -23,5 +23,4 @@ jobs: uses: './.github/workflows/update_schemas.yml' with: artifact_name: NewHorizons-Schemas-Debug - secrets: - SCHEMAS_TOKEN: ${{ secrets.SCHEMAS_TOKEN }} + secrets: inherit diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml index 6d9c7d71..f59e71b4 100644 --- a/.github/workflows/release_build.yml +++ b/.github/workflows/release_build.yml @@ -34,8 +34,7 @@ jobs: uses: ./.github/workflows/update_schemas.yml with: artifact_name: NewHorizons-Schemas-Release - secrets: - SCHEMAS_TOKEN: ${{ secrets.SCHEMAS_TOKEN }} + secrets: inherit Update_Docs: name: 'Update Docs' needs: Build From 23d27e3221a1fbce0f224ac424999c58ea6182d4 Mon Sep 17 00:00:00 2001 From: Ben C Date: Tue, 15 Nov 2022 18:53:18 +0000 Subject: [PATCH 5/5] Updated Schemas --- NewHorizons/Schemas/body_schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NewHorizons/Schemas/body_schema.json b/NewHorizons/Schemas/body_schema.json index 53171b59..fdfbca63 100644 --- a/NewHorizons/Schemas/body_schema.json +++ b/NewHorizons/Schemas/body_schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-04/schema#", "title": "Celestial Body Schema", "type": "object", - "description": "Describes a body to generate", + "description": "Describes a celestial body to generate", "additionalProperties": false, "required": [ "name"