diff --git a/.github/workflows/d2ai-auto-merge.yml b/.github/workflows/d2ai-auto-merge.yml index 99d2998b65..36e6e68385 100644 --- a/.github/workflows/d2ai-auto-merge.yml +++ b/.github/workflows/d2ai-auto-merge.yml @@ -14,7 +14,7 @@ jobs: id: app-token with: # required - app-id: ${{ vars.AUTOMERGE_APP_ID }} + app-id: ${{ secrets.AUTOMERGE_APP_ID }} private-key: ${{ secrets.AUTOMERGE_PRIVATE_KEY }} - name: Enable auto-merge for d2ai PRs run: gh pr merge --auto --merge "$PR_URL" diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 253105fc24..2fd739a9af 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -14,7 +14,7 @@ jobs: id: app-token with: # required - app-id: ${{ vars.AUTOMERGE_APP_ID }} + app-id: ${{ secrets.AUTOMERGE_APP_ID }} private-key: ${{ secrets.AUTOMERGE_PRIVATE_KEY }} - name: Dependabot metadata id: metadata diff --git a/src/data/d2/source-info-v2.ts b/src/data/d2/source-info-v2.ts index f57547a139..9bcf2a2034 100644 --- a/src/data/d2/source-info-v2.ts +++ b/src/data/d2/source-info-v2.ts @@ -1109,6 +1109,11 @@ const D2Sources: { ], enteredDCV: 20, }, + salvationsedge: { + sourceHashes: [ + 2700267533, // Source: "Salvation's Edge" Raid + ], + }, scourgeofthepast: { itemHashes: [ 2557722678, // Midnight Smith diff --git a/src/data/d2/source-info.ts b/src/data/d2/source-info.ts index 5a8ab559bd..302dd1c8ca 100644 --- a/src/data/d2/source-info.ts +++ b/src/data/d2/source-info.ts @@ -1649,6 +1649,13 @@ const D2Sources: { ], searchString: [], }, + salvationsedge: { + itemHashes: [], + sourceHashes: [ + 2700267533, // Source: "Salvation's Edge" Raid + ], + searchString: [], + }, scourge: { itemHashes: [ 2557722678, // Midnight Smith