From 218f5df707a211159acb78158abdde6fca47604d Mon Sep 17 00:00:00 2001 From: Razzmatazz Date: Wed, 12 Jul 2023 10:34:50 -0500 Subject: [PATCH 1/2] add taskImageLink --- .github/workflows/branch-deploy.yml | 2 +- .github/workflows/deploy.yml | 2 +- .github/workflows/unlock-on-merge.yml | 2 +- package-lock.json | 18 +++++++++--------- package.json | 2 +- schema.js | 1 + 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml index a0325023..29ecc6f3 100644 --- a/.github/workflows/branch-deploy.yml +++ b/.github/workflows/branch-deploy.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: github/branch-deploy@v6.0.0 + - uses: github/branch-deploy@v6.0.1 id: branch-deploy with: admins: the-hideout/core-contributors diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a8d019f9..fc9dc132 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -17,7 +17,7 @@ jobs: steps: # https://github.com/github/branch-deploy/blob/d3c24bd92505e623615b75ffdfac5ed5259adbdb/docs/merge-commit-strategy.md - name: deployment check - uses: github/branch-deploy@v6.0.0 + uses: github/branch-deploy@v6.0.1 id: deployment-check with: merge_deploy_mode: "true" diff --git a/.github/workflows/unlock-on-merge.yml b/.github/workflows/unlock-on-merge.yml index 342e10b9..930d1731 100644 --- a/.github/workflows/unlock-on-merge.yml +++ b/.github/workflows/unlock-on-merge.yml @@ -16,7 +16,7 @@ jobs: steps: - name: unlock on merge - uses: github/branch-deploy@v6.0.0 + uses: github/branch-deploy@v6.0.1 id: unlock-on-merge with: unlock_on_merge_mode: "true" # <-- indicates that this is the "Unlock on Merge Mode" workflow diff --git a/package-lock.json b/package-lock.json index 1a3cdf35..c3b1771d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ }, "devDependencies": { "newman": "^5.3.2", - "prettier": "^2.8.8", + "prettier": "^3.0.0", "wrangler": "^2.19.0" }, "engines": { @@ -2207,15 +2207,15 @@ } }, "node_modules/prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.0.tgz", + "integrity": "sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==", "dev": true, "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" @@ -4380,9 +4380,9 @@ } }, "prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.0.tgz", + "integrity": "sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==", "dev": true }, "pretty-ms": { diff --git a/package.json b/package.json index d7cea0e5..f7494836 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "license": "ISC", "devDependencies": { "newman": "^5.3.2", - "prettier": "^2.8.8", + "prettier": "^3.0.0", "wrangler": "^2.19.0" }, "dependencies": { diff --git a/schema.js b/schema.js index bb58527c..c8ff705d 100644 --- a/schema.js +++ b/schema.js @@ -819,6 +819,7 @@ type Task { map: Map experience: Int! wikiLink: String + taskImageLink: String minPlayerLevel: Int taskRequirements: [TaskStatusRequirement]! traderRequirements: [RequirementTrader]! From 7476bdfb5ac100226a3e641fce68a61242a712ca Mon Sep 17 00:00:00 2001 From: Grant Birkinbine Date: Tue, 25 Jul 2023 23:00:20 +0100 Subject: [PATCH 2/2] branch-deploy to v7.0.0 --- .github/workflows/branch-deploy.yml | 2 +- .github/workflows/deploy.yml | 2 +- .github/workflows/unlock-on-merge.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml index 29ecc6f3..71e07c1e 100644 --- a/.github/workflows/branch-deploy.yml +++ b/.github/workflows/branch-deploy.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: github/branch-deploy@v6.0.1 + - uses: github/branch-deploy@v7.0.0 id: branch-deploy with: admins: the-hideout/core-contributors diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index fc9dc132..cd2af272 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -17,7 +17,7 @@ jobs: steps: # https://github.com/github/branch-deploy/blob/d3c24bd92505e623615b75ffdfac5ed5259adbdb/docs/merge-commit-strategy.md - name: deployment check - uses: github/branch-deploy@v6.0.1 + uses: github/branch-deploy@v7.0.0 id: deployment-check with: merge_deploy_mode: "true" diff --git a/.github/workflows/unlock-on-merge.yml b/.github/workflows/unlock-on-merge.yml index 930d1731..5db584a5 100644 --- a/.github/workflows/unlock-on-merge.yml +++ b/.github/workflows/unlock-on-merge.yml @@ -16,7 +16,7 @@ jobs: steps: - name: unlock on merge - uses: github/branch-deploy@v6.0.1 + uses: github/branch-deploy@v7.0.0 id: unlock-on-merge with: unlock_on_merge_mode: "true" # <-- indicates that this is the "Unlock on Merge Mode" workflow