From f1d9598e266e7d419b414a6359c44cd37a45a7ad Mon Sep 17 00:00:00 2001 From: foxriver76 Date: Wed, 7 Aug 2024 21:16:56 +0200 Subject: [PATCH 1/3] define higher timeout --- .github/workflows/test-and-release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml index 73dda4ea0..787f31d66 100644 --- a/.github/workflows/test-and-release.yml +++ b/.github/workflows/test-and-release.yml @@ -104,6 +104,7 @@ jobs: UPDATE_LABELS: "automated pr 🔧" MERGE_METHOD: "squash" MERGE_COMMIT_MESSAGE: "pull-request-title-and-description" + MERGE_RETRY_SLEEP: 10000 - name: Checkout code if: steps.automerge.outputs.mergeResult == 'merged' From 55e4d5f41775abe2ad96a0077be989eb578b99fa Mon Sep 17 00:00:00 2001 From: foxriver76 Date: Wed, 7 Aug 2024 21:21:59 +0200 Subject: [PATCH 2/3] fix commit messages and reduce CI time --- .github/workflows/test-and-release.yml | 5 +---- .releaseconfig.json | 6 +----- README.md | 2 +- package.json | 1 - 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml index 787f31d66..e7eb82fef 100644 --- a/.github/workflows/test-and-release.yml +++ b/.github/workflows/test-and-release.yml @@ -144,10 +144,7 @@ jobs: if: steps.automerge.outputs.mergeResult == 'merged' run: npm install - - name: Create a clean build - if: steps.automerge.outputs.mergeResult == 'merged' - run: npm run build - + # The prepublish script also creates a build - name: Publish package to npm if: steps.automerge.outputs.mergeResult == 'merged' run: | diff --git a/.releaseconfig.json b/.releaseconfig.json index 8864273fa..6f9d0f553 100644 --- a/.releaseconfig.json +++ b/.releaseconfig.json @@ -1,7 +1,3 @@ { - "all": true, - "plugins": ["iobroker", "license", "manual-review"], - "exec": { - "before_commit": "npm run build" - } + "plugins": ["iobroker", "license"] } diff --git a/README.md b/README.md index 5ce30371b..174b0920c 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Executes Javascript, Typescript Scripts. -### 8.8.1 (2024-08-07) +### **WORK IN PROGRESS** * (@GermanBluefox) updated dependencies ### 8.8.0 (2024-08-05) diff --git a/package.json b/package.json index 18607b6c2..c8415bb83 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,6 @@ "@alcalzone/release-script": "^3.8.0", "@alcalzone/release-script-plugin-iobroker": "^3.7.2", "@alcalzone/release-script-plugin-license": "^3.7.0", - "@alcalzone/release-script-plugin-manual-review": "^3.7.0", "@iobroker/adapter-dev": "^1.3.0", "@iobroker/types": "^6.0.10", "@iobroker/vis-2-widgets-react-dev": "^3.0.7", From 0c9f5a933551e630b3f30425daaa0b3471cba3a6 Mon Sep 17 00:00:00 2001 From: foxriver76 Date: Wed, 7 Aug 2024 21:24:36 +0200 Subject: [PATCH 3/3] make builds explicit where necessary --- .github/workflows/create-release.yml | 3 +++ .github/workflows/test-and-release.yml | 4 ++++ package.json | 1 - 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 652f0669f..62a003d85 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -38,6 +38,9 @@ jobs: - name: Test run: npm test + - name: Build + run: npm run build + - name: Prepare release env: VERSION_BUMP: ${{ inputs.versionBump }} diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml index e7eb82fef..b405ed4c6 100644 --- a/.github/workflows/test-and-release.yml +++ b/.github/workflows/test-and-release.yml @@ -144,6 +144,10 @@ jobs: if: steps.automerge.outputs.mergeResult == 'merged' run: npm install + - name: Build + if: steps.automerge.outputs.mergeResult == 'merged' + run: npm run build + # The prepublish script also creates a build - name: Publish package to npm if: steps.automerge.outputs.mergeResult == 'merged' diff --git a/package.json b/package.json index c8415bb83..6042cb456 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,6 @@ "test": "npm run test:declarations && npm run test:javascript", "translate": "translate-adapter", "//postinstall": "node ./install/installTypings.js", - "prepublishOnly": "node node_modules/gulp/bin/gulp.js", "build": "node node_modules/gulp/bin/gulp.js", "release": "release-script --noPush -y", "update-packages": "ncu --upgrade && cd src && ncu --upgrade && cd ../src-admin && ncu --upgrade",