From 3ddaf1eee9a5cb4343c413582697261e00998e19 Mon Sep 17 00:00:00 2001 From: Alice Fage Date: Tue, 15 Aug 2023 16:18:04 +1200 Subject: [PATCH 1/5] ci: update publish and formatting TDE-792 --- .eslintrc.cjs | 1 - .eslintrc.js | 3 +++ .github/workflows/create-pr.yml | 18 ++++++++++++++++++ .github/workflows/publish.yml | 4 +++- .prettierrc.cjs | 1 - .prettierrc.js | 3 +++ 6 files changed, 27 insertions(+), 3 deletions(-) delete mode 100644 .eslintrc.cjs create mode 100644 .eslintrc.js create mode 100644 .github/workflows/create-pr.yml delete mode 100644 .prettierrc.cjs create mode 100644 .prettierrc.js diff --git a/.eslintrc.cjs b/.eslintrc.cjs deleted file mode 100644 index 12d0e788..00000000 --- a/.eslintrc.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = { ...require('@linzjs/style/.eslintrc.cjs') }; diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 00000000..1ab131f0 --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,3 @@ +module.exports = { + ...require('@linzjs/style/.eslintrc.js'), +}; diff --git a/.github/workflows/create-pr.yml b/.github/workflows/create-pr.yml new file mode 100644 index 00000000..ddbac825 --- /dev/null +++ b/.github/workflows/create-pr.yml @@ -0,0 +1,18 @@ +name: Pull Request Action +on: + push: + branches: + - feat/bot-* +jobs: + create-pull-request: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: pull-request + run: | + gh pr edit ${{ github.ref_name }} --title '${{ github.event.head_commit.message }}' --body '' && + gh pr reopen ${{ github.ref_name }} || + gh pr create --base master --title '${{ github.event.head_commit.message }}' --body '' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7bbadb88..ddd3d53a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -6,6 +6,8 @@ jobs: main: name: Publish runs-on: ubuntu-latest + concurrency: publish-${{ github.ref }} + permissions: id-token: write contents: read @@ -19,7 +21,7 @@ jobs: with: args: stac-catalog --output stac/catalog.json --template template/catalog.json /github/workspace/stac/ - # FIXME: no collections exist so nothing to validate + # FIXME: add when content in repo # - name: Validate STAC # run: | # # Enable double star operator diff --git a/.prettierrc.cjs b/.prettierrc.cjs deleted file mode 100644 index fa1c53cb..00000000 --- a/.prettierrc.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = { ...require('@linzjs/style/.prettierrc.cjs') }; diff --git a/.prettierrc.js b/.prettierrc.js new file mode 100644 index 00000000..f6dd284f --- /dev/null +++ b/.prettierrc.js @@ -0,0 +1,3 @@ +module.exports = { + ...require('@linzjs/style/.prettierrc.js'), +}; From 9d7441eb14524524a934384761f1a1c5cbddd60f Mon Sep 17 00:00:00 2001 From: Alice Fage Date: Tue, 15 Aug 2023 16:19:52 +1200 Subject: [PATCH 2/5] fix: extraneous space --- template/catalog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/catalog.json b/template/catalog.json index 481bb649..9b012c36 100644 --- a/template/catalog.json +++ b/template/catalog.json @@ -2,7 +2,7 @@ "stac_version": "1.0.0", "type": "Catalog", "id": "linz-elevation", - "description": "Toitū Te Whenua Land Information New Zealand makes New Zealand's publicly owned elevation archive freely available to use under an open licence. ", + "description": "Toitū Te Whenua Land Information New Zealand makes New Zealand's publicly owned elevation archive freely available to use under an open licence.", "links": [ { "rel": "self", "href": "https://linz-elevation.s3.ap-southeast-2.amazonaws.com/catalog.json" }, { "rel": "root", "href": "./catalog.json" } From f3509438482dc7c5df3c59a1f8d83ebe79b8fe6a Mon Sep 17 00:00:00 2001 From: Alice Fage Date: Tue, 15 Aug 2023 16:24:07 +1200 Subject: [PATCH 3/5] fix: formatters --- .eslintrc.cjs | 3 +++ .eslintrc.js | 3 --- .prettierrc.cjs | 3 +++ .prettierrc.js | 3 --- 4 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 .eslintrc.cjs delete mode 100644 .eslintrc.js create mode 100644 .prettierrc.cjs delete mode 100644 .prettierrc.js diff --git a/.eslintrc.cjs b/.eslintrc.cjs new file mode 100644 index 00000000..d0b664c1 --- /dev/null +++ b/.eslintrc.cjs @@ -0,0 +1,3 @@ +module.exports = { + ...require('@linzjs/style/.prettierrc.cjs'), +}; diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index 1ab131f0..00000000 --- a/.eslintrc.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - ...require('@linzjs/style/.eslintrc.js'), -}; diff --git a/.prettierrc.cjs b/.prettierrc.cjs new file mode 100644 index 00000000..d0b664c1 --- /dev/null +++ b/.prettierrc.cjs @@ -0,0 +1,3 @@ +module.exports = { + ...require('@linzjs/style/.prettierrc.cjs'), +}; diff --git a/.prettierrc.js b/.prettierrc.js deleted file mode 100644 index f6dd284f..00000000 --- a/.prettierrc.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - ...require('@linzjs/style/.prettierrc.js'), -}; From 34b009740ddb8dd472a6e3b549558a1af65edb96 Mon Sep 17 00:00:00 2001 From: Alice Fage Date: Tue, 15 Aug 2023 16:27:48 +1200 Subject: [PATCH 4/5] fix: formatters --- .eslintrc.cjs | 4 +--- .prettierrc.cjs | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index d0b664c1..8e708b79 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -1,3 +1 @@ -module.exports = { - ...require('@linzjs/style/.prettierrc.cjs'), -}; +module.exports = { ...require('@linzjs/style/.eslintrc.cjs') }; \ No newline at end of file diff --git a/.prettierrc.cjs b/.prettierrc.cjs index d0b664c1..ebbc8230 100644 --- a/.prettierrc.cjs +++ b/.prettierrc.cjs @@ -1,3 +1 @@ -module.exports = { - ...require('@linzjs/style/.prettierrc.cjs'), -}; +module.exports = { ...require('@linzjs/style/.prettierrc.cjs') }; \ No newline at end of file From 682c283d34838153cf4f0185eaf20286b38c6d9e Mon Sep 17 00:00:00 2001 From: Alice Fage Date: Tue, 15 Aug 2023 16:30:48 +1200 Subject: [PATCH 5/5] fix: formatters --- .eslintrc.cjs | 2 +- .prettierrc.cjs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 8e708b79..12d0e788 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -1 +1 @@ -module.exports = { ...require('@linzjs/style/.eslintrc.cjs') }; \ No newline at end of file +module.exports = { ...require('@linzjs/style/.eslintrc.cjs') }; diff --git a/.prettierrc.cjs b/.prettierrc.cjs index ebbc8230..fa1c53cb 100644 --- a/.prettierrc.cjs +++ b/.prettierrc.cjs @@ -1 +1 @@ -module.exports = { ...require('@linzjs/style/.prettierrc.cjs') }; \ No newline at end of file +module.exports = { ...require('@linzjs/style/.prettierrc.cjs') };