From 05b377f1bb1210b236eba7c214fa56cb492f8cf4 Mon Sep 17 00:00:00 2001 From: Digitalroot Date: Tue, 14 May 2024 22:56:53 -0700 Subject: [PATCH] Updated --- .github/workflows/discord.yml | 16 ---------------- .github/workflows/nuget.release.yml | 2 ++ src/Digitalroot.Valheim.Common.Log.sln | 1 + .../Digitalroot.Valheim.Common.Log.csproj | 2 +- .../packages.lock.json | 6 +++--- src/UnitTests/packages.lock.json | 6 +++--- 6 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 .github/workflows/discord.yml diff --git a/.github/workflows/discord.yml b/.github/workflows/discord.yml deleted file mode 100644 index 77c2254..0000000 --- a/.github/workflows/discord.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Discord Webhook - -on: - push: - branches: [ main ] # Default release branch - paths: - - 'src/**' - - '.github/workflows/**' - -jobs: - discord: - uses: Digitalroot-Valheim/.github/.github/workflows/discord.yml@main - with: - repo_name: ${{ github.event.repository.name }} - secrets: - webhook_url: ${{ secrets.VALHEIM_DISCORD_TITANS_WEBHOOK_URL }} diff --git a/.github/workflows/nuget.release.yml b/.github/workflows/nuget.release.yml index cc236db..4a4e8c8 100644 --- a/.github/workflows/nuget.release.yml +++ b/.github/workflows/nuget.release.yml @@ -21,6 +21,8 @@ jobs: secrets: aws-access-key-id: ${{ secrets.NUGET_S3_REPO_KEY_ID }} aws-secret-access-key: ${{ secrets.NUGET_S3_REPO_KEY_SECRET }} + webhook_url: ${{ secrets.VALHEIM_DISCORD_TITANS_WEBHOOK_URL }} + with: sln-file-name: Digitalroot.Valheim.Common.Log proj-file-name: Digitalroot.Valheim.Common.Log diff --git a/src/Digitalroot.Valheim.Common.Log.sln b/src/Digitalroot.Valheim.Common.Log.sln index 9396673..2b0799d 100644 --- a/src/Digitalroot.Valheim.Common.Log.sln +++ b/src/Digitalroot.Valheim.Common.Log.sln @@ -20,6 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{AA57 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{66F61AAD-E15A-473F-8B2E-12FE0796D886}" ProjectSection(SolutionItems) = preProject + ..\.github\workflows\nuget.autoupdate.yml = ..\.github\workflows\nuget.autoupdate.yml ..\.github\workflows\nuget.release.yml = ..\.github\workflows\nuget.release.yml EndProjectSection EndProject diff --git a/src/Digitalroot.Valheim.Common.Log/Digitalroot.Valheim.Common.Log.csproj b/src/Digitalroot.Valheim.Common.Log/Digitalroot.Valheim.Common.Log.csproj index 016d452..405db55 100644 --- a/src/Digitalroot.Valheim.Common.Log/Digitalroot.Valheim.Common.Log.csproj +++ b/src/Digitalroot.Valheim.Common.Log/Digitalroot.Valheim.Common.Log.csproj @@ -53,7 +53,7 @@ all - + \ No newline at end of file diff --git a/src/Digitalroot.Valheim.Common.Log/packages.lock.json b/src/Digitalroot.Valheim.Common.Log/packages.lock.json index 934c1a0..74e1ab4 100644 --- a/src/Digitalroot.Valheim.Common.Log/packages.lock.json +++ b/src/Digitalroot.Valheim.Common.Log/packages.lock.json @@ -14,9 +14,9 @@ }, "Digitalroot.Valheim.Common.Json": { "type": "Direct", - "requested": "[1.0.40, )", - "resolved": "1.0.40", - "contentHash": "Iabdb4/ro5RtpLmIYpwcgvhkA3sCG57H/A3Mt7VZ+3E1u58w9Mi+asqhujrOmKBJeGbEBjfvv3UfFw4hLQM8wQ==", + "requested": "[1.0.41, )", + "resolved": "1.0.41", + "contentHash": "GScGAJd21loJA8SLAZ6ZhnP40T3wEF79uEUpL9GDPirr/nwFnybUeafZwKtSWvauPVZT/x/fXc8SJ5j68WjQ5Q==", "dependencies": { "Digitalroot.References.Unity": "2022.3.17", "LibZ.Tool": "1.2.0" diff --git a/src/UnitTests/packages.lock.json b/src/UnitTests/packages.lock.json index 470066d..14c9b6a 100644 --- a/src/UnitTests/packages.lock.json +++ b/src/UnitTests/packages.lock.json @@ -54,8 +54,8 @@ }, "Digitalroot.Valheim.Common.Json": { "type": "Transitive", - "resolved": "1.0.40", - "contentHash": "Iabdb4/ro5RtpLmIYpwcgvhkA3sCG57H/A3Mt7VZ+3E1u58w9Mi+asqhujrOmKBJeGbEBjfvv3UfFw4hLQM8wQ==", + "resolved": "1.0.41", + "contentHash": "GScGAJd21loJA8SLAZ6ZhnP40T3wEF79uEUpL9GDPirr/nwFnybUeafZwKtSWvauPVZT/x/fXc8SJ5j68WjQ5Q==", "dependencies": { "Digitalroot.References.Unity": "2022.3.17", "LibZ.Tool": "1.2.0" @@ -117,7 +117,7 @@ "digitalroot.valheim.common.log": { "type": "Project", "dependencies": { - "Digitalroot.Valheim.Common.Json": "[1.0.40, )" + "Digitalroot.Valheim.Common.Json": "[1.0.41, )" } } }