From bdd6644b675372924ff1c81312dfb60af49b8783 Mon Sep 17 00:00:00 2001 From: Jiri Spilka Date: Tue, 21 Jan 2025 21:43:08 +0100 Subject: [PATCH 1/9] CI Changes --- .github/workflows/pre_release.yaml | 4 +++- .github/workflows/release.yaml | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pre_release.yaml b/.github/workflows/pre_release.yaml index 8c675f56..dfa427cc 100644 --- a/.github/workflows/pre_release.yaml +++ b/.github/workflows/pre_release.yaml @@ -87,11 +87,13 @@ jobs: uses: actions/setup-node@v4 with: node-version: 22 + cache: 'npm' + cache-dependency-path: 'package-lock.json' - name: Install dependencies run: | echo "access=public" >> .npmrc echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> .npmrc - npm install + npm ci - # Check version consistency and increment pre-release version number for beta only. name: Bump pre-release version run: node ./.github/scripts/before-beta-release.cjs diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 47674cd1..93f70b68 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -43,8 +43,19 @@ jobs: custom_version: ${{ inputs.custom_version }} existing_changelog_path: CHANGELOG.md + wait_for_checks: + name: Wait for code checks to pass + runs-on: ubuntu-latest + steps: + - uses: lewagon/wait-on-check-action@v1.3.4 + with: + ref: ${{ github.ref }} + repo-token: ${{ secrets.GITHUB_TOKEN }} + check-regexp: (Build & Test .*|Lint|Docs build) + wait-interval: 5 + update_changelog: - needs: [ release_metadata ] + needs: [ release_metadata, wait_for_checks ] name: Update changelog runs-on: ubuntu-latest outputs: @@ -106,6 +117,8 @@ jobs: uses: actions/setup-node@v4 with: node-version: 22 + cache: 'npm' + cache-dependency-path: 'package-lock.json' - name: Install dependencies run: | echo "access=public" >> .npmrc From 18071781891a1d17e5f6f2f7a103374fefbfed58 Mon Sep 17 00:00:00 2001 From: Jiri Spilka Date: Tue, 21 Jan 2025 21:45:26 +0100 Subject: [PATCH 2/9] CI Changes --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 93f70b68..075772be 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -51,7 +51,7 @@ jobs: with: ref: ${{ github.ref }} repo-token: ${{ secrets.GITHUB_TOKEN }} - check-regexp: (Build & Test .*|Lint|Docs build) + check-name: 'Lint' wait-interval: 5 update_changelog: From 632d8f0d1ee9e015bfe3202b0e994def61149415 Mon Sep 17 00:00:00 2001 From: Jiri Spilka Date: Tue, 21 Jan 2025 21:47:09 +0100 Subject: [PATCH 3/9] CI Changes --- .github/workflows/check.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 6742f943..478fef84 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -9,6 +9,7 @@ on: push: branches: - master + - fix/ci tags-ignore: - "**" # Ignore all tags to prevent duplicate builds when tags are pushed. From c0552bd0d1839d68f797824edd515edd4b8b30ed Mon Sep 17 00:00:00 2001 From: Jiri Spilka Date: Tue, 21 Jan 2025 21:56:00 +0100 Subject: [PATCH 4/9] Create release --- .github/workflows/pre_release.yaml | 3 ++- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pre_release.yaml b/.github/workflows/pre_release.yaml index dfa427cc..1da3713a 100644 --- a/.github/workflows/pre_release.yaml +++ b/.github/workflows/pre_release.yaml @@ -5,6 +5,7 @@ on: push: branches: - master + - fix/ci tags-ignore: - "**" # Ignore all tags to prevent duplicate builds when tags are pushed. @@ -100,7 +101,7 @@ jobs: - name: Build module run: npm run build - name: Publish to NPM - run: npm publish --tag beta + run: npm publish env: NODE_AUTH_TOKEN: ${{ secrets.APIFY_SERVICE_ACCOUNT_NPM_TOKEN }} diff --git a/package-lock.json b/package-lock.json index b8f6b2a3..6658b181 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@apify/actors-mcp-server", - "version": "0.1.2", + "version": "0.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@apify/actors-mcp-server", - "version": "0.1.2", + "version": "0.1.3", "license": "MIT", "dependencies": { "@modelcontextprotocol/sdk": "^1.3.1", diff --git a/package.json b/package.json index 6e19b40d..6d529e44 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@apify/actors-mcp-server", - "version": "0.1.2", + "version": "0.1.3", "type": "module", "description": "Model Context Protocol Server for Apify Actors", "engines": { From 025c19c450764df6f7441165afa14a54678e884b Mon Sep 17 00:00:00 2001 From: Apify Release Bot Date: Tue, 21 Jan 2025 20:56:42 +0000 Subject: [PATCH 5/9] chore(release): Update changelog and package version [skip ci] --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6658b181..b8f6b2a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@apify/actors-mcp-server", - "version": "0.1.3", + "version": "0.1.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@apify/actors-mcp-server", - "version": "0.1.3", + "version": "0.1.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/sdk": "^1.3.1", diff --git a/package.json b/package.json index 6d529e44..6e19b40d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@apify/actors-mcp-server", - "version": "0.1.3", + "version": "0.1.2", "type": "module", "description": "Model Context Protocol Server for Apify Actors", "engines": { From bea3dcf7db7d0498cd9fbd013311a6bc4f081135 Mon Sep 17 00:00:00 2001 From: Jiri Spilka Date: Tue, 21 Jan 2025 21:57:50 +0100 Subject: [PATCH 6/9] Create release --- .github/scripts/before-beta-release.cjs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/scripts/before-beta-release.cjs b/.github/scripts/before-beta-release.cjs index 26ae4e1f..f7df9146 100644 --- a/.github/scripts/before-beta-release.cjs +++ b/.github/scripts/before-beta-release.cjs @@ -27,6 +27,5 @@ function getNextVersion(version) { const prereleaseNumbers = versions .filter((v) => (v.startsWith(VERSION) && v.includes('-'))) .map((v) => Number(v.match(/\.(\d+)$/)[1])); - const lastPrereleaseNumber = Math.max(-1, ...prereleaseNumbers); - return `${version}-beta.${lastPrereleaseNumber + 1}`; + return `${version}`; } From 6d0138bcbc7bc0ab99db8e151af86d8dfe184d96 Mon Sep 17 00:00:00 2001 From: Jiri Spilka Date: Tue, 21 Jan 2025 22:01:44 +0100 Subject: [PATCH 7/9] Revert --- .github/scripts/before-beta-release.cjs | 3 ++- .github/workflows/check.yaml | 1 - .github/workflows/pre_release.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/scripts/before-beta-release.cjs b/.github/scripts/before-beta-release.cjs index f7df9146..26ae4e1f 100644 --- a/.github/scripts/before-beta-release.cjs +++ b/.github/scripts/before-beta-release.cjs @@ -27,5 +27,6 @@ function getNextVersion(version) { const prereleaseNumbers = versions .filter((v) => (v.startsWith(VERSION) && v.includes('-'))) .map((v) => Number(v.match(/\.(\d+)$/)[1])); - return `${version}`; + const lastPrereleaseNumber = Math.max(-1, ...prereleaseNumbers); + return `${version}-beta.${lastPrereleaseNumber + 1}`; } diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 478fef84..6742f943 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -9,7 +9,6 @@ on: push: branches: - master - - fix/ci tags-ignore: - "**" # Ignore all tags to prevent duplicate builds when tags are pushed. diff --git a/.github/workflows/pre_release.yaml b/.github/workflows/pre_release.yaml index 1da3713a..02b22ecc 100644 --- a/.github/workflows/pre_release.yaml +++ b/.github/workflows/pre_release.yaml @@ -101,7 +101,7 @@ jobs: - name: Build module run: npm run build - name: Publish to NPM - run: npm publish + run: npm publish --tag beta env: NODE_AUTH_TOKEN: ${{ secrets.APIFY_SERVICE_ACCOUNT_NPM_TOKEN }} From a76fc4c6a2ce89cf6bccf5a3c22271124bffa99f Mon Sep 17 00:00:00 2001 From: Jiri Spilka Date: Tue, 21 Jan 2025 22:07:25 +0100 Subject: [PATCH 8/9] Add check-regexp --- .github/workflows/pre_release.yaml | 2 +- .github/workflows/release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pre_release.yaml b/.github/workflows/pre_release.yaml index 02b22ecc..e63f4507 100644 --- a/.github/workflows/pre_release.yaml +++ b/.github/workflows/pre_release.yaml @@ -37,7 +37,7 @@ jobs: with: ref: ${{ github.ref }} repo-token: ${{ secrets.GITHUB_TOKEN }} - check-name: 'Lint' + check-regexp: (Build & Test .*|Lint|Docs build) wait-interval: 5 update_changelog: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 075772be..93f70b68 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -51,7 +51,7 @@ jobs: with: ref: ${{ github.ref }} repo-token: ${{ secrets.GITHUB_TOKEN }} - check-name: 'Lint' + check-regexp: (Build & Test .*|Lint|Docs build) wait-interval: 5 update_changelog: From f958b207e1766690adb24bc9bddaaef8bded5bc5 Mon Sep 17 00:00:00 2001 From: Jiri Spilka Date: Tue, 21 Jan 2025 22:09:14 +0100 Subject: [PATCH 9/9] Remove ci --- .github/workflows/pre_release.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pre_release.yaml b/.github/workflows/pre_release.yaml index e63f4507..321ab834 100644 --- a/.github/workflows/pre_release.yaml +++ b/.github/workflows/pre_release.yaml @@ -5,7 +5,6 @@ on: push: branches: - master - - fix/ci tags-ignore: - "**" # Ignore all tags to prevent duplicate builds when tags are pushed.