From 86225d326851a6a30e496ec251f20ef0ac3e8d18 Mon Sep 17 00:00:00 2001 From: jubianchi Date: Mon, 2 May 2022 10:40:36 +0200 Subject: [PATCH 01/14] chore: Configure GitHub actions --- .github/workflows/docker.yml | 43 ++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 0000000..1c78e03 --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,43 @@ +name: Docker + +on: + push: + branches: + - '*' + #- 'master' + +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + +jobs: + build-and-push-image: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Log in to the Container registry + uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + + - name: Build and push Docker image + uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc + with: + context: . + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file From 5aa28f37c9746cda2ea01972d3f8312b8acddb29 Mon Sep 17 00:00:00 2001 From: jubianchi Date: Mon, 2 May 2022 11:17:49 +0200 Subject: [PATCH 02/14] fixup! chore: Configure GitHub actions --- .github/workflows/check.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/check.yml diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml new file mode 100644 index 0000000..512ae43 --- /dev/null +++ b/.github/workflows/check.yml @@ -0,0 +1,26 @@ +name: Check + +on: + push: + branches: + - '*' + +jobs: + yarn-checks: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - uses: borales/actions-yarn@v2.3.0 + with: + cmd: install + + - uses: borales/actions-yarn@v2.3.0 + with: + cmd: run cs + + - uses: borales/actions-yarn@v2.3.0 + with: + cmd: run changelog-lint From 537d53d0ff5b69d4af61ebb705f92e4d9d7a9160 Mon Sep 17 00:00:00 2001 From: jubianchi Date: Mon, 2 May 2022 11:23:28 +0200 Subject: [PATCH 03/14] fixup! chore: Configure GitHub actions --- .github/workflows/check.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 512ae43..747632d 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -9,18 +9,18 @@ jobs: yarn-checks: runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v3 + steps: + - name: Checkout repository + uses: actions/checkout@v3 - - uses: borales/actions-yarn@v2.3.0 - with: - cmd: install + - uses: borales/actions-yarn@v2.3.0 + with: + cmd: install - - uses: borales/actions-yarn@v2.3.0 - with: - cmd: run cs + - uses: borales/actions-yarn@v2.3.0 + with: + cmd: run cs - - uses: borales/actions-yarn@v2.3.0 - with: - cmd: run changelog-lint + - uses: borales/actions-yarn@v2.3.0 + with: + cmd: run changelog-lint From 78236546501df693e2b8f1ab5cdc0f70b7646855 Mon Sep 17 00:00:00 2001 From: jubianchi Date: Mon, 2 May 2022 11:38:23 +0200 Subject: [PATCH 04/14] fixup! chore: Configure GitHub actions --- .github/workflows/check.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 747632d..cf71cf6 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -13,6 +13,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 + - name: Install dependencies + run: | + sudo apt-get update -y + sudo apt-get install libpq-dev + - uses: borales/actions-yarn@v2.3.0 with: cmd: install From 392609d2b76ff66e7ab0aa0f97c515672ceaad5f Mon Sep 17 00:00:00 2001 From: jubianchi Date: Mon, 2 May 2022 11:44:47 +0200 Subject: [PATCH 05/14] fixup! chore: Configure GitHub actions --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index cf71cf6..7b3628d 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -16,7 +16,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update -y - sudo apt-get install libpq-dev + sudo apt-get install libpq libpq-dev - uses: borales/actions-yarn@v2.3.0 with: From 40ca8b116652caceb3a33284539f6fa95e902f1c Mon Sep 17 00:00:00 2001 From: jubianchi Date: Mon, 2 May 2022 11:49:21 +0200 Subject: [PATCH 06/14] fixup! chore: Configure GitHub actions --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 7b3628d..455da8a 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -16,7 +16,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update -y - sudo apt-get install libpq libpq-dev + sudo apt-get install -y python libpq-dev - uses: borales/actions-yarn@v2.3.0 with: From 619ba2b1a8d695f5ba6422a805a9f03cab25a6ef Mon Sep 17 00:00:00 2001 From: jubianchi Date: Mon, 2 May 2022 11:50:45 +0200 Subject: [PATCH 07/14] fixup! chore: Configure GitHub actions --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 455da8a..9c76e5b 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -16,7 +16,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update -y - sudo apt-get install -y python libpq-dev + sudo apt-get install -y python3 libpq-dev - uses: borales/actions-yarn@v2.3.0 with: From a46abdc56538c7a694907baff6b947948dbb4126 Mon Sep 17 00:00:00 2001 From: jubianchi Date: Mon, 2 May 2022 11:52:33 +0200 Subject: [PATCH 08/14] fixup! chore: Configure GitHub actions --- .github/workflows/check.yml | 31 ------------------- .github/workflows/{docker.yml => default.yml} | 24 ++++++++++++++ 2 files changed, 24 insertions(+), 31 deletions(-) delete mode 100644 .github/workflows/check.yml rename .github/workflows/{docker.yml => default.yml} (68%) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml deleted file mode 100644 index 9c76e5b..0000000 --- a/.github/workflows/check.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: Check - -on: - push: - branches: - - '*' - -jobs: - yarn-checks: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Install dependencies - run: | - sudo apt-get update -y - sudo apt-get install -y python3 libpq-dev - - - uses: borales/actions-yarn@v2.3.0 - with: - cmd: install - - - uses: borales/actions-yarn@v2.3.0 - with: - cmd: run cs - - - uses: borales/actions-yarn@v2.3.0 - with: - cmd: run changelog-lint diff --git a/.github/workflows/docker.yml b/.github/workflows/default.yml similarity index 68% rename from .github/workflows/docker.yml rename to .github/workflows/default.yml index 1c78e03..f97c4bf 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/default.yml @@ -11,6 +11,30 @@ env: IMAGE_NAME: ${{ github.repository }} jobs: + yarn-checks: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Install dependencies + run: | + sudo apt-get update -y + sudo apt-get install -y python3 libpq-dev + + - uses: borales/actions-yarn@v2.3.0 + with: + cmd: install + + - uses: borales/actions-yarn@v2.3.0 + with: + cmd: run cs + + - uses: borales/actions-yarn@v2.3.0 + with: + cmd: run changelog-lint + build-and-push-image: runs-on: ubuntu-latest permissions: From 17dc21773c68f91d8ea699bb76511d069b8bd19f Mon Sep 17 00:00:00 2001 From: jubianchi Date: Mon, 2 May 2022 14:20:06 +0200 Subject: [PATCH 09/14] fixup! chore: Configure GitHub actions --- .github/workflows/default.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index f97c4bf..9fd58f4 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -23,6 +23,12 @@ jobs: sudo apt-get update -y sudo apt-get install -y python3 libpq-dev + - name: Set up Python + uses: actions/setup-python@v3 + with: + python-version: 3.x + architecture: x64 + - uses: borales/actions-yarn@v2.3.0 with: cmd: install From 49282e119afc02b5ca008bdcc5fb59c12b691ecd Mon Sep 17 00:00:00 2001 From: jubianchi Date: Mon, 2 May 2022 14:24:04 +0200 Subject: [PATCH 10/14] fixup! chore: Configure GitHub actions --- .github/workflows/default.yml | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 9fd58f4..0645a43 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -1,4 +1,4 @@ -name: Docker +name: CI on: push: @@ -18,31 +18,27 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Install dependencies - run: | - sudo apt-get update -y - sudo apt-get install -y python3 libpq-dev - - name: Set up Python uses: actions/setup-python@v3 with: python-version: 3.x architecture: x64 - - uses: borales/actions-yarn@v2.3.0 - with: - cmd: install + - name: Install + run: | + yarn - - uses: borales/actions-yarn@v2.3.0 - with: - cmd: run cs + - name: CS check + run: | + yarn run cs - - uses: borales/actions-yarn@v2.3.0 - with: - cmd: run changelog-lint + - name: Changelog check + run: | + yarn run changelog-lint build-and-push-image: runs-on: ubuntu-latest + needs: [yarn-checks] permissions: contents: read packages: write From 8c9dfbb5cf2bfb5c56f923fc01e38cd47931b5e6 Mon Sep 17 00:00:00 2001 From: jubianchi Date: Mon, 2 May 2022 14:38:17 +0200 Subject: [PATCH 11/14] fixup! chore: Configure GitHub actions --- .github/workflows/default.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 0645a43..4162497 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -18,6 +18,12 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 + - name: Set up Node + uses: actions/setup-node@v3 + with: + node-version: 12 + cache: yarn + - name: Set up Python uses: actions/setup-python@v3 with: From c10874eadebbb19d1bad01e333d3b0b207aa86b5 Mon Sep 17 00:00:00 2001 From: jubianchi Date: Mon, 2 May 2022 14:40:55 +0200 Subject: [PATCH 12/14] fixup! chore: Configure GitHub actions --- .github/workflows/default.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 4162497..33ac3ee 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -21,7 +21,7 @@ jobs: - name: Set up Node uses: actions/setup-node@v3 with: - node-version: 12 + node-version: 9 cache: yarn - name: Set up Python From c412ff994dd9b0991b5403d3429ff12ade1ff7e9 Mon Sep 17 00:00:00 2001 From: jubianchi Date: Wed, 4 May 2022 09:16:33 +0200 Subject: [PATCH 13/14] fixup! chore: Configure GitHub actions --- .github/workflows/default.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 33ac3ee..056db21 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -38,10 +38,6 @@ jobs: run: | yarn run cs - - name: Changelog check - run: | - yarn run changelog-lint - build-and-push-image: runs-on: ubuntu-latest needs: [yarn-checks] From 6d8eac5d6453d85f2d4b38747d2f5ddf7566f299 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 May 2022 07:19:40 +0000 Subject: [PATCH 14/14] chore(deps): bump node-fetch from 1.7.1 to 2.6.7 Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 1.7.1 to 2.6.7. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Commits](https://github.com/node-fetch/node-fetch/compare/v1.7.1...v2.6.7) --- updated-dependencies: - dependency-name: node-fetch dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 36 ++++++++++++++++++++---------------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 2382e85..4227a61 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "dependencies": { "caporal": "^0.6.0", "dnscache": "^1.0.1", - "node-fetch": "^1.7.1", + "node-fetch": "^2.6.7", "pg": "^7.18.2", "pg-native": "^3.0.0", "postgrator": "^3.1.0", diff --git a/yarn.lock b/yarn.lock index 1331d52..2dca3fc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -690,12 +690,6 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" -encoding@^0.1.11: - version "0.1.12" - resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb" - dependencies: - iconv-lite "~0.4.13" - error-ex@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" @@ -1175,7 +1169,7 @@ http-signature@~1.1.0: jsprim "^1.2.2" sshpk "^1.7.0" -iconv-lite@^0.4.17, iconv-lite@~0.4.13: +iconv-lite@^0.4.17: version "0.4.17" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.17.tgz#4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d" @@ -1306,10 +1300,6 @@ is-resolvable@^1.0.0: dependencies: tryit "^1.0.1" -is-stream@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - is-subset@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6" @@ -1645,12 +1635,11 @@ newline@0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/newline/-/newline-0.0.3.tgz#0f6a74493223dba04fe7dbfb6cdc804bf7e46dd0" -node-fetch@^1.7.1: - version "1.7.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.1.tgz#899cb3d0a3c92f952c47f1b876f4c8aeabd400d5" +node-fetch@^2.6.7: + version "2.6.7" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" dependencies: - encoding "^0.1.11" - is-stream "^1.0.1" + whatwg-url "^5.0.0" normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5: version "2.3.8" @@ -2447,6 +2436,10 @@ tough-cookie@~2.3.0: dependencies: punycode "^1.4.1" +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + trigram-utils@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/trigram-utils/-/trigram-utils-0.1.1.tgz#7df8a092c9897fc2e09dac22f423e283231762e7" @@ -2533,6 +2526,17 @@ verror@1.3.6: dependencies: extsprintf "1.0.2" +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + which@^1.2.9: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"