From 8e506f0dd62a4e1fcb30353ccbd24e781b658beb Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Date: Wed, 20 Mar 2024 13:58:12 -0700 Subject: [PATCH 1/7] Update changelog.yml --- .github/workflows/changelog.yml | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 70821e5e59a..c5821edbe8e 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -28,11 +28,34 @@ jobs: git config --global user.email "${{ vars.CHANGELOG_EMAIL }}" shell: bash - - name: Setup Node + - name: Setup NodeJS uses: actions/setup-node@v3 with: node-version: 18.x + - name: Cache Dependencies + id: cache-npm + uses: actions/cache@v3 + env: + cache-name: cache-changelog-node-modules + with: + # npm cache files are stored in `~/.npm` on Linux/macOS + path: ~/.npm + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + continue-on-error: true + + - if: ${{ steps.cache-npm.outputs.cache-hit != 'true' }} + name: List the State of Dependencies + run: | + cd "Tools/changelog" + npm list + shell: bash + continue-on-error: true + - name: Install Dependencies run: | cd "Tools/changelog" From 13211c347bf2bbca2200807b431f22ec3e0f1544 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Date: Wed, 20 Mar 2024 14:11:20 -0700 Subject: [PATCH 2/7] Update build-test-debug.yml --- .github/workflows/build-test-debug.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml index 519f5af6f49..6e81c03bb54 100644 --- a/.github/workflows/build-test-debug.yml +++ b/.github/workflows/build-test-debug.yml @@ -38,8 +38,34 @@ jobs: with: dotnet-version: 8.0.x + - name: Cache NuGet + id: cache-nuget + uses: actions/cache@v3 + env: + cache-name: cache-nuget + with: + path: ~/.nuget/packages + # Look to see if there is a cache hit for the corresponding requirements file + key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }} + restore-keys: | + ${{ runner.os }}-nuget + continue-on-error: true + - name: Install dependencies run: dotnet restore + + - name: Cache Build + id: cache-debugopt + uses: actions/cache@v3 + env: + cache-name: cache-build-debugopt + with: + path: bin + # Look to see if there is a cache hit for the corresponding requirements file + key: ${{ runner.os }}-build-debugopt-${{ hashFiles('**/*.csproj') }} + restore-keys: | + ${{ runner.os }}-build-debugopt + continue-on-error: true - name: Build Project run: dotnet build --configuration DebugOpt --no-restore /p:WarningsAsErrors=nullable /m From 89285060474aedaa3d48c059a01e05e1a0be2ab1 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Date: Wed, 20 Mar 2024 14:13:41 -0700 Subject: [PATCH 3/7] Update build-map-renderer.yml --- .github/workflows/build-map-renderer.yml | 28 +++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml index 01575f64b9b..6d4286b1a7e 100644 --- a/.github/workflows/build-map-renderer.yml +++ b/.github/workflows/build-map-renderer.yml @@ -37,9 +37,35 @@ jobs: uses: actions/setup-dotnet@v3.2.0 with: dotnet-version: 8.0.x - + + - name: Cache NuGet + id: cache-nuget + uses: actions/cache@v3 + env: + cache-name: cache-nuget + with: + path: ~/.nuget/packages + # Look to see if there is a cache hit for the corresponding requirements file + key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }} + restore-keys: | + ${{ runner.os }}-nuget + continue-on-error: true + - name: Install dependencies run: dotnet restore + + - name: Cache Build + id: cache-release + uses: actions/cache@v3 + env: + cache-name: cache-build-release + with: + path: bin + # Look to see if there is a cache hit for the corresponding requirements file + key: ${{ runner.os }}-build-release-${{ hashFiles('**/*.csproj') }} + restore-keys: | + ${{ runner.os }}-build-release + continue-on-error: true - name: Build Project run: dotnet build Content.MapRenderer --configuration Release --no-restore /p:WarningsAsErrors=nullable /m From 514e0e98c4390e8ed00b2010852df7c85965b791 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Date: Wed, 20 Mar 2024 14:20:47 -0700 Subject: [PATCH 4/7] Update test-packaging.yml --- .github/workflows/test-packaging.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml index ccece69adb6..80dc910f037 100644 --- a/.github/workflows/test-packaging.yml +++ b/.github/workflows/test-packaging.yml @@ -53,8 +53,34 @@ jobs: with: dotnet-version: 8.0.x + - name: Cache NuGet + id: cache-nuget + uses: actions/cache@v3 + env: + cache-name: cache-nuget + with: + path: ~/.nuget/packages + # Look to see if there is a cache hit for the corresponding requirements file + key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }} + restore-keys: | + ${{ runner.os }}-nuget + continue-on-error: true + - name: Install dependencies run: dotnet restore + + - name: Cache Build + id: cache-release + uses: actions/cache@v3 + env: + cache-name: cache-build-release + with: + path: bin + # Look to see if there is a cache hit for the corresponding requirements file + key: ${{ runner.os }}-build-release-${{ hashFiles('**/*.csproj') }} + restore-keys: | + ${{ runner.os }}-build-release + continue-on-error: true - name: Build Packaging run: dotnet build Content.Packaging --configuration Release --no-restore /m From 2ea2c98fd8d71b0a0d3a6935a546b8163d8f7ef8 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Date: Wed, 20 Mar 2024 14:22:12 -0700 Subject: [PATCH 5/7] Update yaml-linter.yml --- .github/workflows/yaml-linter.yml | 33 +++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml index 796795b234d..fdaa6ec1897 100644 --- a/.github/workflows/yaml-linter.yml +++ b/.github/workflows/yaml-linter.yml @@ -14,22 +14,55 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3.6.0 + - name: Setup submodule run: | git submodule update --init --recursive + - name: Pull engine updates uses: space-wizards/submodule-dependency@v0.1.5 + - name: Update Engine Submodules run: | cd RobustToolbox/ git submodule update --init --recursive + - name: Setup .NET Core uses: actions/setup-dotnet@v3.2.0 with: dotnet-version: 8.0.x + + - name: Cache NuGet + id: cache-nuget + uses: actions/cache@v3 + env: + cache-name: cache-nuget + with: + path: ~/.nuget/packages + # Look to see if there is a cache hit for the corresponding requirements file + key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }} + restore-keys: | + ${{ runner.os }}-nuget + continue-on-error: true + - name: Install dependencies run: dotnet restore + + - name: Cache Build + id: cache-release + uses: actions/cache@v3 + env: + cache-name: cache-build-release + with: + path: bin + # Look to see if there is a cache hit for the corresponding requirements file + key: ${{ runner.os }}-build-release-${{ hashFiles('**/*.csproj') }} + restore-keys: | + ${{ runner.os }}-build-release + continue-on-error: true + - name: Build run: dotnet build --configuration Release --no-restore /p:WarningsAsErrors= /m + - name: Run Linter run: dotnet run --project Content.YAMLLinter/Content.YAMLLinter.csproj --no-build From d6cc30148ff33d0b6180b3f793588b13debcf045 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Tue, 19 Nov 2024 21:39:32 -0800 Subject: [PATCH 6/7] test --- .github/workflows/build-map-renderer.yml | 13 ------------- .github/workflows/build-test-debug.yml | 15 +-------------- .github/workflows/test-packaging.yml | 15 +-------------- .github/workflows/yaml-linter.yml | 20 +------------------- 4 files changed, 3 insertions(+), 60 deletions(-) diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml index d6692189122..7412a64a929 100644 --- a/.github/workflows/build-map-renderer.yml +++ b/.github/workflows/build-map-renderer.yml @@ -38,19 +38,6 @@ jobs: with: dotnet-version: 8.0.100 - - name: Cache NuGet - id: cache-nuget - uses: actions/cache@v3 - env: - cache-name: cache-nuget - with: - path: ~/.nuget/packages - # Look to see if there is a cache hit for the corresponding requirements file - key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }} - restore-keys: | - ${{ runner.os }}-nuget - continue-on-error: true - - name: Install dependencies run: dotnet restore diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml index 63c7cab34f2..b74abea3262 100644 --- a/.github/workflows/build-test-debug.yml +++ b/.github/workflows/build-test-debug.yml @@ -38,22 +38,9 @@ jobs: with: dotnet-version: 8.0.100 - - name: Cache NuGet - id: cache-nuget - uses: actions/cache@v3 - env: - cache-name: cache-nuget - with: - path: ~/.nuget/packages - # Look to see if there is a cache hit for the corresponding requirements file - key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }} - restore-keys: | - ${{ runner.os }}-nuget - continue-on-error: true - - name: Install dependencies run: dotnet restore - + - name: Cache Build id: cache-debugopt uses: actions/cache@v3 diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml index bf4a27e4e81..6cbed1d8d52 100644 --- a/.github/workflows/test-packaging.yml +++ b/.github/workflows/test-packaging.yml @@ -53,22 +53,9 @@ jobs: with: dotnet-version: 8.0.100 - - name: Cache NuGet - id: cache-nuget - uses: actions/cache@v3 - env: - cache-name: cache-nuget - with: - path: ~/.nuget/packages - # Look to see if there is a cache hit for the corresponding requirements file - key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }} - restore-keys: | - ${{ runner.os }}-nuget - continue-on-error: true - - name: Install dependencies run: dotnet restore - + - name: Cache Build id: cache-release uses: actions/cache@v3 diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml index 9b23e7a3415..099ad312e35 100644 --- a/.github/workflows/yaml-linter.yml +++ b/.github/workflows/yaml-linter.yml @@ -32,33 +32,15 @@ jobs: with: dotnet-version: 8.0.100 - - name: Cache NuGet - id: cache-nuget - uses: actions/cache@v3 - env: - cache-name: cache-nuget - with: - path: ~/.nuget/packages - # Look to see if there is a cache hit for the corresponding requirements file - key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }} - restore-keys: | - ${{ runner.os }}-nuget - continue-on-error: true - - name: Install dependencies run: dotnet restore - name: Cache Build id: cache-release uses: actions/cache@v3 - env: - cache-name: cache-build-release with: path: bin - # Look to see if there is a cache hit for the corresponding requirements file - key: ${{ runner.os }}-build-release-${{ hashFiles('**/*.csproj') }} - restore-keys: | - ${{ runner.os }}-build-release + key: ${{ runner.os }}-build-Release continue-on-error: true - name: Build From 47cee6a667d9fd8b2f8d924fe08773810ddcc3db Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Tue, 19 Nov 2024 22:03:44 -0800 Subject: [PATCH 7/7] that's not a list... --- .github/workflows/yaml-linter.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml index 099ad312e35..195562cdb7c 100644 --- a/.github/workflows/yaml-linter.yml +++ b/.github/workflows/yaml-linter.yml @@ -39,9 +39,9 @@ jobs: id: cache-release uses: actions/cache@v3 with: - path: bin + path: | + bin key: ${{ runner.os }}-build-Release - continue-on-error: true - name: Build run: dotnet build --configuration Release --no-restore /p:WarningsAsErrors= /m