From e9881995e9522ace0e5679f68a3c153a06fbae6f Mon Sep 17 00:00:00 2001 From: Ron Nahmias Date: Tue, 20 Feb 2024 00:19:25 +0200 Subject: [PATCH 01/10] Added new workflow for checking updates of israeli-bank-scrapers-library. Fixes #536 --- .../update-israeli-bank-scrapers.yml | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 .github/workflows/update-israeli-bank-scrapers.yml diff --git a/.github/workflows/update-israeli-bank-scrapers.yml b/.github/workflows/update-israeli-bank-scrapers.yml new file mode 100644 index 00000000..42a7af16 --- /dev/null +++ b/.github/workflows/update-israeli-bank-scrapers.yml @@ -0,0 +1,77 @@ +name: Update israeli-bank-scrapers + +on: + schedule: + - cron: '0 0 * * *' + # Manual trigger + workflow_dispatch: + inputs: + logLevel: + description: 'Log level' + required: false + default: 'information' + type: choice + options: + - information + - debug + - warning + - critical + tags: + description: 'Purpose of Run This Workflow?' + required: false + type: string + +jobs: + update: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Set up Node.js + uses: actions/setup-node@v2 + with: + node-version: '16' + + - name: Get old version + id: get_old_version + run: | + old_version=$(grep 'israeli-bank-scrapers-core@' yarn.lock | head -n1 | cut -d'@' -f2) + echo "::set-output name=old_version::$old_version" + + - name: Install dependencies + run: yarn install + + - name: Upgrade israeli-bank-scrapers-core + run: | + yarn upgrade israeli-bank-scrapers-core --latest + + - name: Get new version + id: get_new_version + run: | + new_version=$(grep 'israeli-bank-scrapers-core@' yarn.lock | cut -d'@' -f2) + echo "::set-output name=new_version::$new_version" + + - name: Commit changes + run: | + git config --local user.email "action@github.com" + git config --local user.name "GitHub Action" + git add . + git commit -m "chore: Upgrade israeli-bank-scrapers-core library" || echo "No changes to commit" + + - name: Generate diff link + id: diff_link + run: | + echo "::set-output name=diff_link::https://github.com/eshaham/israeli-bank-scrapers/compare/v${{ steps.get_old_version.outputs.old_version }}...v${{ steps.get_new_version.outputs.new_version }}" + + - name: Create pull request + uses: peter-evans/create-pull-request@v6 + with: + token: ${{ secrets.GITHUB_TOKEN }} + commit-message: 'chore: Upgrade israeli-bank-scrapers-core library' + title: 'Upgrade israeli-bank-scrapers-core library to ${{ steps.get_new_version.outputs.new_version }}' + body: | + Upgrade israeli-bank-scrapers-core library to ${{ steps.get_new_version.outputs.new_version }} + Changes: + - [Diff Link](${{ steps.diff_link.outputs.diff_link }}) From 2a5fa03951c3a28d47b4fc726609d5003e6ebaf6 Mon Sep 17 00:00:00 2001 From: Ron Nahmias Date: Tue, 20 Feb 2024 12:00:49 +0200 Subject: [PATCH 02/10] fixes in workflow update israeli-bank-scrapers --- .../update-israeli-bank-scrapers.yml | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/workflows/update-israeli-bank-scrapers.yml b/.github/workflows/update-israeli-bank-scrapers.yml index 42a7af16..65adbd56 100644 --- a/.github/workflows/update-israeli-bank-scrapers.yml +++ b/.github/workflows/update-israeli-bank-scrapers.yml @@ -27,18 +27,18 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: '16' - name: Get old version id: get_old_version run: | - old_version=$(grep 'israeli-bank-scrapers-core@' yarn.lock | head -n1 | cut -d'@' -f2) - echo "::set-output name=old_version::$old_version" + old_version=$(yarn list --pattern israeli-bank-scrapers-core --depth=0 --json --non-interactive --no-progress | jq -r '.data.trees[].name' | cut -d'@' -f2) + echo "old_version=${old_version}" >> $GITHUB_OUTPUT - name: Install dependencies run: yarn install @@ -50,27 +50,29 @@ jobs: - name: Get new version id: get_new_version run: | - new_version=$(grep 'israeli-bank-scrapers-core@' yarn.lock | cut -d'@' -f2) - echo "::set-output name=new_version::$new_version" + new_version=$(yarn list --pattern israeli-bank-scrapers-core --depth=0 --json --non-interactive --no-progress | jq -r '.data.trees[].name' | cut -d'@' -f2) + echo "new_version=${new_version}" >> $GITHUB_OUTPUT - - name: Commit changes + - name: Check if update is needed + if: ${{ steps.get_old_version.outputs.old_version == steps.get_new_version.outputs.new_version }} run: | - git config --local user.email "action@github.com" - git config --local user.name "GitHub Action" - git add . - git commit -m "chore: Upgrade israeli-bank-scrapers-core library" || echo "No changes to commit" + echo "No update needed, stopping the workflow." + exit 0 + fi - name: Generate diff link id: diff_link run: | - echo "::set-output name=diff_link::https://github.com/eshaham/israeli-bank-scrapers/compare/v${{ steps.get_old_version.outputs.old_version }}...v${{ steps.get_new_version.outputs.new_version }}" + echo "diff_link=https://github.com/eshaham/israeli-bank-scrapers/compare/v${{ steps.get_old_version.outputs.old_version }}...v${{ steps.get_new_version.outputs.new_version }}" >> $GITHUB_OUTPUT - name: Create pull request - uses: peter-evans/create-pull-request@v6 + uses: peter-evans/create-pull-request@b1ddad2c994a25fbc81a28b3ec0e368bb2021c50 with: token: ${{ secrets.GITHUB_TOKEN }} - commit-message: 'chore: Upgrade israeli-bank-scrapers-core library' - title: 'Upgrade israeli-bank-scrapers-core library to ${{ steps.get_new_version.outputs.new_version }}' + branch: 'deps/israeli-bank-scrapers-core-${{ steps.get_new_version.outputs.new_version }}' + delete-branch: true # Delete the branch after the pull request is closed + commit-message: 'Deps: Upgrade israeli-bank-scrapers to ${{ steps.get_new_version.outputs.new_version }}' + title: 'Deps: Upgrade israeli-bank-scrapers to ${{ steps.get_new_version.outputs.new_version }}' body: | Upgrade israeli-bank-scrapers-core library to ${{ steps.get_new_version.outputs.new_version }} Changes: From de13b6831a18fcf140fc2c20ae6f2a6f2a10ee95 Mon Sep 17 00:00:00 2001 From: Baruch Odem Date: Tue, 20 Feb 2024 13:50:25 +0200 Subject: [PATCH 03/10] test on pr --- .github/workflows/update-israeli-bank-scrapers.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/update-israeli-bank-scrapers.yml b/.github/workflows/update-israeli-bank-scrapers.yml index 65adbd56..adbf779f 100644 --- a/.github/workflows/update-israeli-bank-scrapers.yml +++ b/.github/workflows/update-israeli-bank-scrapers.yml @@ -1,6 +1,7 @@ name: Update israeli-bank-scrapers on: + pull_request: schedule: - cron: '0 0 * * *' # Manual trigger From 6e5d0e63441a908ca64ab75c729261d4f5e13a3c Mon Sep 17 00:00:00 2001 From: Ron Nahmias Date: Tue, 20 Feb 2024 14:15:38 +0200 Subject: [PATCH 04/10] fix branch pr to a const name --- .github/workflows/update-israeli-bank-scrapers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-israeli-bank-scrapers.yml b/.github/workflows/update-israeli-bank-scrapers.yml index 65adbd56..3f263763 100644 --- a/.github/workflows/update-israeli-bank-scrapers.yml +++ b/.github/workflows/update-israeli-bank-scrapers.yml @@ -69,7 +69,7 @@ jobs: uses: peter-evans/create-pull-request@b1ddad2c994a25fbc81a28b3ec0e368bb2021c50 with: token: ${{ secrets.GITHUB_TOKEN }} - branch: 'deps/israeli-bank-scrapers-core-${{ steps.get_new_version.outputs.new_version }}' + branch: 'deps/israeli-bank-scrapers-core' delete-branch: true # Delete the branch after the pull request is closed commit-message: 'Deps: Upgrade israeli-bank-scrapers to ${{ steps.get_new_version.outputs.new_version }}' title: 'Deps: Upgrade israeli-bank-scrapers to ${{ steps.get_new_version.outputs.new_version }}' From 3955ef0999c0d3397860159d127c7efa20ff63dd Mon Sep 17 00:00:00 2001 From: Ron Nahmias Date: Tue, 20 Feb 2024 16:00:14 +0200 Subject: [PATCH 05/10] Update israeli-bank-scrapers workflow and dependencies --- .../update-israeli-bank-scrapers.yml | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/.github/workflows/update-israeli-bank-scrapers.yml b/.github/workflows/update-israeli-bank-scrapers.yml index ace96cc6..ac463c50 100644 --- a/.github/workflows/update-israeli-bank-scrapers.yml +++ b/.github/workflows/update-israeli-bank-scrapers.yml @@ -6,21 +6,6 @@ on: - cron: '0 0 * * *' # Manual trigger workflow_dispatch: - inputs: - logLevel: - description: 'Log level' - required: false - default: 'information' - type: choice - options: - - information - - debug - - warning - - critical - tags: - description: 'Purpose of Run This Workflow?' - required: false - type: string jobs: update: @@ -54,13 +39,6 @@ jobs: new_version=$(yarn list --pattern israeli-bank-scrapers-core --depth=0 --json --non-interactive --no-progress | jq -r '.data.trees[].name' | cut -d'@' -f2) echo "new_version=${new_version}" >> $GITHUB_OUTPUT - - name: Check if update is needed - if: ${{ steps.get_old_version.outputs.old_version == steps.get_new_version.outputs.new_version }} - run: | - echo "No update needed, stopping the workflow." - exit 0 - fi - - name: Generate diff link id: diff_link run: | @@ -71,6 +49,7 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} branch: 'deps/israeli-bank-scrapers-core' + base: 'master' delete-branch: true # Delete the branch after the pull request is closed commit-message: 'Deps: Upgrade israeli-bank-scrapers to ${{ steps.get_new_version.outputs.new_version }}' title: 'Deps: Upgrade israeli-bank-scrapers to ${{ steps.get_new_version.outputs.new_version }}' From 5cc978187310d44579a66e247b6058bfbfdc795a Mon Sep 17 00:00:00 2001 From: Baruch Odem Date: Tue, 20 Feb 2024 16:14:17 +0200 Subject: [PATCH 06/10] fake downgrade ibs --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f0074cc9..a9ae4367 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "electron-updater": "^5.2.4", "emittery": "^0.10.0", "googleapis": "^87.0.0", - "israeli-bank-scrapers-core": "4.2.2", + "israeli-bank-scrapers-core": "^3", "keytar": "^7.4.0", "lint-staged": "~13.2.3", "lodash": "^4.17.15", diff --git a/yarn.lock b/yarn.lock index 78cad128..97143084 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9967,10 +9967,10 @@ isobject@^3.0.0, isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= -israeli-bank-scrapers-core@4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/israeli-bank-scrapers-core/-/israeli-bank-scrapers-core-4.2.2.tgz#021a9b0987de27b99a44a26bb90793d275e7bac4" - integrity sha512-RCbpF/Gzf6gCZWfeeLQVg1FachrBhxaDU3k/H/RwTDkIIs7haii8BvQIYv2ettN+QwjZ9QGOYVPndBpF9yNF5g== +israeli-bank-scrapers-core@^3: + version "3.10.3" + resolved "https://registry.yarnpkg.com/israeli-bank-scrapers-core/-/israeli-bank-scrapers-core-3.10.3.tgz#e00ed35f97367324612fce63204406c80ff60df9" + integrity sha512-p9RADocnQVKWXspojv/c2b5Z7vR80WBUv8I/7BT9LQA89UK6NW8hH54xcrogUoNZyeICzva1gfcBdWEHbsDUHA== dependencies: build-url "^2.0.0" core-js "^3.1.4" From 48a7ff105c97c9f7f39c53d64328d25749058b90 Mon Sep 17 00:00:00 2001 From: Baruch Odem Date: Wed, 21 Feb 2024 12:22:07 +0200 Subject: [PATCH 07/10] add permissions --- .github/workflows/update-israeli-bank-scrapers.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/update-israeli-bank-scrapers.yml b/.github/workflows/update-israeli-bank-scrapers.yml index ac463c50..5225e08d 100644 --- a/.github/workflows/update-israeli-bank-scrapers.yml +++ b/.github/workflows/update-israeli-bank-scrapers.yml @@ -7,6 +7,10 @@ on: # Manual trigger workflow_dispatch: +permissions: + contents: read + pull-requests: write + jobs: update: runs-on: ubuntu-latest From c3802b35cef5e1e3a4a8c883d011d41cd209dc99 Mon Sep 17 00:00:00 2001 From: Baruch Odem Date: Wed, 21 Feb 2024 12:43:09 +0200 Subject: [PATCH 08/10] permission job level --- .github/workflows/update-israeli-bank-scrapers.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update-israeli-bank-scrapers.yml b/.github/workflows/update-israeli-bank-scrapers.yml index 5225e08d..d134121a 100644 --- a/.github/workflows/update-israeli-bank-scrapers.yml +++ b/.github/workflows/update-israeli-bank-scrapers.yml @@ -7,13 +7,12 @@ on: # Manual trigger workflow_dispatch: -permissions: - contents: read - pull-requests: write - jobs: update: runs-on: ubuntu-latest + permissions: + contents: read + pull-requests: write steps: - name: Checkout repository From 541c26620e4b51d2f9741d7673f7cadefefa0976 Mon Sep 17 00:00:00 2001 From: Baruch Odem Date: Wed, 21 Feb 2024 12:50:52 +0200 Subject: [PATCH 09/10] copilot itiot! --- .github/workflows/update-israeli-bank-scrapers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-israeli-bank-scrapers.yml b/.github/workflows/update-israeli-bank-scrapers.yml index d134121a..322cf7fd 100644 --- a/.github/workflows/update-israeli-bank-scrapers.yml +++ b/.github/workflows/update-israeli-bank-scrapers.yml @@ -11,7 +11,7 @@ jobs: update: runs-on: ubuntu-latest permissions: - contents: read + contents: write pull-requests: write steps: From ccceab9138effd76712f80337962a08a61b52854 Mon Sep 17 00:00:00 2001 From: Baruch Odem Date: Wed, 21 Feb 2024 13:19:49 +0200 Subject: [PATCH 10/10] Revert "fake downgrade ibs" This reverts commit 5cc978187310d44579a66e247b6058bfbfdc795a. --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a9ae4367..f0074cc9 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "electron-updater": "^5.2.4", "emittery": "^0.10.0", "googleapis": "^87.0.0", - "israeli-bank-scrapers-core": "^3", + "israeli-bank-scrapers-core": "4.2.2", "keytar": "^7.4.0", "lint-staged": "~13.2.3", "lodash": "^4.17.15", diff --git a/yarn.lock b/yarn.lock index 97143084..78cad128 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9967,10 +9967,10 @@ isobject@^3.0.0, isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= -israeli-bank-scrapers-core@^3: - version "3.10.3" - resolved "https://registry.yarnpkg.com/israeli-bank-scrapers-core/-/israeli-bank-scrapers-core-3.10.3.tgz#e00ed35f97367324612fce63204406c80ff60df9" - integrity sha512-p9RADocnQVKWXspojv/c2b5Z7vR80WBUv8I/7BT9LQA89UK6NW8hH54xcrogUoNZyeICzva1gfcBdWEHbsDUHA== +israeli-bank-scrapers-core@4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/israeli-bank-scrapers-core/-/israeli-bank-scrapers-core-4.2.2.tgz#021a9b0987de27b99a44a26bb90793d275e7bac4" + integrity sha512-RCbpF/Gzf6gCZWfeeLQVg1FachrBhxaDU3k/H/RwTDkIIs7haii8BvQIYv2ettN+QwjZ9QGOYVPndBpF9yNF5g== dependencies: build-url "^2.0.0" core-js "^3.1.4"