From de369c8160aa97806ecb27ed07c993bc72e65686 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Fri, 25 Oct 2024 14:33:31 +0200 Subject: [PATCH 01/19] Configure fdm-core to publish to GitHub Packages --- fdm-core/package.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/fdm-core/package.json b/fdm-core/package.json index c418329e2..02ccf885c 100644 --- a/fdm-core/package.json +++ b/fdm-core/package.json @@ -1,10 +1,14 @@ { "name": "fdm-core", - "private": true, + "private": false, "version": "0.3.0", "description": "Interface for the Farm Data Model", "license": "MIT", - "homepage": "https://github.com/SvenVw/fdm", + "homepage": "https://svenvw.github.io/fdm/", + "repository": { + "type": "git", + "url": "git+https://github.com/SvenVw/fdm.git" + }, "bugs": "https://github.com/SvenVw/fdm/issues/new", "author": { "name": "Sven Verweij", @@ -70,6 +74,9 @@ "postgres": "^3.4.4" }, "packageManager": "pnpm@9.12.2", + "publishConfig": { + "registry": "https://npm.pkg.github.com" + }, "pnpm": { "packageExtensions": { "vite-plugin-dts": { @@ -87,4 +94,4 @@ } } } -} +} \ No newline at end of file From b357b4c9f6d67546d8837f033c95997084c42a18 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Fri, 25 Oct 2024 14:41:29 +0200 Subject: [PATCH 02/19] Trigger test and publish for fdm-docs only if change is made in fdm-docs --- .changeset/neat-dodos-promise.md | 5 +++++ .github/workflows/deploy-docs-test.yml | 2 ++ .github/workflows/deploy-docs.yml | 2 ++ 3 files changed, 9 insertions(+) create mode 100644 .changeset/neat-dodos-promise.md diff --git a/.changeset/neat-dodos-promise.md b/.changeset/neat-dodos-promise.md new file mode 100644 index 000000000..f47716823 --- /dev/null +++ b/.changeset/neat-dodos-promise.md @@ -0,0 +1,5 @@ +--- +"fdm-docs": patch +--- + +Trigger test and publish for fdm-docs only if change is made in fdm-docs diff --git a/.github/workflows/deploy-docs-test.yml b/.github/workflows/deploy-docs-test.yml index 902ec6e71..eb9dd7d69 100644 --- a/.github/workflows/deploy-docs-test.yml +++ b/.github/workflows/deploy-docs-test.yml @@ -6,6 +6,8 @@ defaults: on: pull_request: + paths: + - 'fdm-docs/**' branches: - main # Review gh actions docs if you want to further define triggers, paths, etc diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 91f9822b7..1fbc1ec2b 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -6,6 +6,8 @@ defaults: on: push: + paths: + - 'fdm-docs/**' branches: - main # Review gh actions docs if you want to further define triggers, paths, etc From 1750661ff3e0c3421511c42ef8179167231dd998 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Fri, 25 Oct 2024 14:52:57 +0200 Subject: [PATCH 03/19] Add GitHub Action to publish dev version of fdm-core to GitHub Packages --- .changeset/sour-islands-hear.md | 5 +++ .github/workflows/publish-fdm-core.yml | 42 ++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 .changeset/sour-islands-hear.md create mode 100644 .github/workflows/publish-fdm-core.yml diff --git a/.changeset/sour-islands-hear.md b/.changeset/sour-islands-hear.md new file mode 100644 index 000000000..9e5e67529 --- /dev/null +++ b/.changeset/sour-islands-hear.md @@ -0,0 +1,5 @@ +--- +"fdm-core": patch +--- + +Add GitHub Action to publish dev version of fdm-core to GitHub Packages diff --git a/.github/workflows/publish-fdm-core.yml b/.github/workflows/publish-fdm-core.yml new file mode 100644 index 000000000..339c043cf --- /dev/null +++ b/.github/workflows/publish-fdm-core.yml @@ -0,0 +1,42 @@ +name: Publish fdm-core (dev) to GitHub Packages + +defaults: + run: + working-directory: ./fdm-core + +on: + pull_request: + paths: + - 'fdm-core/**' + branches: + - main + +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + node-version: [20] + permissions: + contents: read + packages: write + steps: + - uses: actions/checkout@v4 + - name: Install pnpm + uses: pnpm/action-setup@v4 + with: + version: 9.12.2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node-version }} + registry-url: 'https://npm.pkg.github.com' + cache: 'pnpm' + - name: Install dependencies + run: pnpm install --frozen-lockfile --filter fdm-core + # - name: Run tests + # run: pnpm test + - name: Publish the package + run: pnpm publish --tag ${{ GITHUB_HEAD_REF }}:${{ GITHUB_SHA }} + env: + NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From b2fa1f8b1de0c000bc0bc039d309ef2596524471 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Fri, 25 Oct 2024 14:55:46 +0200 Subject: [PATCH 04/19] Update changelog and bump version numbers --- .changeset/neat-dodos-promise.md | 5 ----- .changeset/proud-comics-heal.md | 5 ----- .changeset/sour-islands-hear.md | 5 ----- fdm-calculator/CHANGELOG.md | 9 +++++++++ fdm-calculator/package.json | 2 +- fdm-core/CHANGELOG.md | 7 +++++++ fdm-core/package.json | 2 +- fdm-data/CHANGELOG.md | 8 ++++++++ fdm-data/package.json | 2 +- fdm-docs/CHANGELOG.md | 6 ++++++ fdm-docs/package.json | 2 +- 11 files changed, 34 insertions(+), 19 deletions(-) delete mode 100644 .changeset/neat-dodos-promise.md delete mode 100644 .changeset/proud-comics-heal.md delete mode 100644 .changeset/sour-islands-hear.md create mode 100644 fdm-calculator/CHANGELOG.md diff --git a/.changeset/neat-dodos-promise.md b/.changeset/neat-dodos-promise.md deleted file mode 100644 index f47716823..000000000 --- a/.changeset/neat-dodos-promise.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"fdm-docs": patch ---- - -Trigger test and publish for fdm-docs only if change is made in fdm-docs diff --git a/.changeset/proud-comics-heal.md b/.changeset/proud-comics-heal.md deleted file mode 100644 index 695fccbc4..000000000 --- a/.changeset/proud-comics-heal.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"fdm-core": patch ---- - -Fix building by updating `vite-plugin-dts` diff --git a/.changeset/sour-islands-hear.md b/.changeset/sour-islands-hear.md deleted file mode 100644 index 9e5e67529..000000000 --- a/.changeset/sour-islands-hear.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"fdm-core": patch ---- - -Add GitHub Action to publish dev version of fdm-core to GitHub Packages diff --git a/fdm-calculator/CHANGELOG.md b/fdm-calculator/CHANGELOG.md new file mode 100644 index 000000000..7999c41c6 --- /dev/null +++ b/fdm-calculator/CHANGELOG.md @@ -0,0 +1,9 @@ +# fdm-calculator + +## 0.0.1 + +### Patch Changes + +- Updated dependencies [6f6b1c4] +- Updated dependencies [1750661] + - fdm-core@0.3.1 diff --git a/fdm-calculator/package.json b/fdm-calculator/package.json index 0d8ef2c9c..d446a84b1 100644 --- a/fdm-calculator/package.json +++ b/fdm-calculator/package.json @@ -1,7 +1,7 @@ { "name": "fdm-calculator", "private": true, - "version": "0.0.0", + "version": "0.0.1", "description": "Calculate various insights based on the Farm Data Model", "license": "MIT", "homepage": "https://github.com/SvenVw/fdm", diff --git a/fdm-core/CHANGELOG.md b/fdm-core/CHANGELOG.md index 5ad100e23..669787753 100644 --- a/fdm-core/CHANGELOG.md +++ b/fdm-core/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog fdm-core +## 0.3.1 + +### Patch Changes + +- 6f6b1c4: Fix building by updating `vite-plugin-dts` +- 1750661: Add GitHub Action to publish dev version of fdm-core to GitHub Packages + ## 0.3.0 ### Minor Changes diff --git a/fdm-core/package.json b/fdm-core/package.json index 02ccf885c..e953aa71a 100644 --- a/fdm-core/package.json +++ b/fdm-core/package.json @@ -1,7 +1,7 @@ { "name": "fdm-core", "private": false, - "version": "0.3.0", + "version": "0.3.1", "description": "Interface for the Farm Data Model", "license": "MIT", "homepage": "https://svenvw.github.io/fdm/", diff --git a/fdm-data/CHANGELOG.md b/fdm-data/CHANGELOG.md index 8071bd956..f1b188350 100644 --- a/fdm-data/CHANGELOG.md +++ b/fdm-data/CHANGELOG.md @@ -1,5 +1,13 @@ # fdm-data +## 0.1.1 + +### Patch Changes + +- Updated dependencies [6f6b1c4] +- Updated dependencies [1750661] + - fdm-core@0.3.1 + ## 0.1.0 ### Minor Changes diff --git a/fdm-data/package.json b/fdm-data/package.json index 9e705e487..d1464affb 100644 --- a/fdm-data/package.json +++ b/fdm-data/package.json @@ -1,7 +1,7 @@ { "name": "fdm-data", "private": true, - "version": "0.1.0", + "version": "0.1.1", "description": "Extend Farm Data Model with catalogue data", "license": "MIT", "homepage": "https://github.com/SvenVw/fdm", diff --git a/fdm-docs/CHANGELOG.md b/fdm-docs/CHANGELOG.md index 86a2dc616..e95a1e5c9 100644 --- a/fdm-docs/CHANGELOG.md +++ b/fdm-docs/CHANGELOG.md @@ -1,5 +1,11 @@ # fdm-docs +## 0.1.2 + +### Patch Changes + +- b357b4c: Trigger test and publish for fdm-docs only if change is made in fdm-docs + ## 0.1.1 ### Patch Changes diff --git a/fdm-docs/package.json b/fdm-docs/package.json index f2b6641a2..d6e9c8dd2 100644 --- a/fdm-docs/package.json +++ b/fdm-docs/package.json @@ -1,6 +1,6 @@ { "name": "fdm-docs", - "version": "0.1.1", + "version": "0.1.2", "private": true, "scripts": { "docusaurus": "docusaurus", From ce44ddeaad7d038f7fc39609aae3411d4f4d0ef5 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Fri, 25 Oct 2024 14:59:00 +0200 Subject: [PATCH 05/19] Fix environment setting for workflow --- .github/workflows/publish-fdm-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-fdm-core.yml b/.github/workflows/publish-fdm-core.yml index 339c043cf..007c36406 100644 --- a/.github/workflows/publish-fdm-core.yml +++ b/.github/workflows/publish-fdm-core.yml @@ -37,6 +37,6 @@ jobs: # - name: Run tests # run: pnpm test - name: Publish the package - run: pnpm publish --tag ${{ GITHUB_HEAD_REF }}:${{ GITHUB_SHA }} + run: pnpm publish --tag ${{ github.head.ref }}:${{ github.sha }} env: NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From 648e78ff2ad7ae0bc20fc5c63cc27c1335e7dd18 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Fri, 25 Oct 2024 15:06:03 +0200 Subject: [PATCH 06/19] Fixes --- .github/workflows/publish-fdm-core.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/publish-fdm-core.yml b/.github/workflows/publish-fdm-core.yml index 007c36406..57019a026 100644 --- a/.github/workflows/publish-fdm-core.yml +++ b/.github/workflows/publish-fdm-core.yml @@ -1,9 +1,5 @@ name: Publish fdm-core (dev) to GitHub Packages -defaults: - run: - working-directory: ./fdm-core - on: pull_request: paths: @@ -37,6 +33,6 @@ jobs: # - name: Run tests # run: pnpm test - name: Publish the package - run: pnpm publish --tag ${{ github.head.ref }}:${{ github.sha }} + run: pnpm publish fdm-core --tag ${{ github.head_ref }}:${{ github.sha }} --no-git-checks env: NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From b7722b8c8a1a8501ac5bc1f705aa0e8c7fbb67c7 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Fri, 25 Oct 2024 15:10:58 +0200 Subject: [PATCH 07/19] Fix tag --- .github/workflows/publish-fdm-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-fdm-core.yml b/.github/workflows/publish-fdm-core.yml index 57019a026..4acda0a6c 100644 --- a/.github/workflows/publish-fdm-core.yml +++ b/.github/workflows/publish-fdm-core.yml @@ -33,6 +33,6 @@ jobs: # - name: Run tests # run: pnpm test - name: Publish the package - run: pnpm publish fdm-core --tag ${{ github.head_ref }}:${{ github.sha }} --no-git-checks + run: pnpm publish fdm-core --tag ${{ github.head_ref }} --no-git-checks env: NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From cee9421f002134227fa9cd6809f2c688fa715513 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Fri, 25 Oct 2024 15:14:40 +0200 Subject: [PATCH 08/19] Fix scope name --- fdm-core/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdm-core/package.json b/fdm-core/package.json index e953aa71a..1d57f965c 100644 --- a/fdm-core/package.json +++ b/fdm-core/package.json @@ -1,5 +1,5 @@ { - "name": "fdm-core", + "name": "@svenvw/fdm-core", "private": false, "version": "0.3.1", "description": "Interface for the Farm Data Model", From 7dc5275e24764dfd2a4cd1e4004f6b36cbb27313 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Fri, 25 Oct 2024 15:18:15 +0200 Subject: [PATCH 09/19] Add Turbo cache for actions --- .github/workflows/deploy-docs-test.yml | 7 +++++++ .github/workflows/deploy-docs.yml | 7 +++++++ .github/workflows/publish-fdm-core.yml | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/.github/workflows/deploy-docs-test.yml b/.github/workflows/deploy-docs-test.yml index eb9dd7d69..3f7079c63 100644 --- a/.github/workflows/deploy-docs-test.yml +++ b/.github/workflows/deploy-docs-test.yml @@ -22,6 +22,13 @@ jobs: node-version: [20] steps: - uses: actions/checkout@v4 + - name: Cache turbo build setup + uses: actions/cache@v4 + with: + path: .turbo + key: ${{ runner.os }}-turbo-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-turbo- - name: Install pnpm uses: pnpm/action-setup@v4 with: diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 1fbc1ec2b..35b4dde25 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -22,6 +22,13 @@ jobs: node-version: [20] steps: - uses: actions/checkout@v4 + - name: Cache turbo build setup + uses: actions/cache@v4 + with: + path: .turbo + key: ${{ runner.os }}-turbo-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-turbo- - name: Install pnpm uses: pnpm/action-setup@v4 with: diff --git a/.github/workflows/publish-fdm-core.yml b/.github/workflows/publish-fdm-core.yml index 4acda0a6c..567c8c205 100644 --- a/.github/workflows/publish-fdm-core.yml +++ b/.github/workflows/publish-fdm-core.yml @@ -18,6 +18,13 @@ jobs: packages: write steps: - uses: actions/checkout@v4 + - name: Cache turbo build setup + uses: actions/cache@v4 + with: + path: .turbo + key: ${{ runner.os }}-turbo-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-turbo- - name: Install pnpm uses: pnpm/action-setup@v4 with: From 81604bce6a2d99e21765ac3151abea95b6b7fb81 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Fri, 25 Oct 2024 16:36:21 +0200 Subject: [PATCH 10/19] Add branch name to version --- .github/workflows/publish-fdm-core.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publish-fdm-core.yml b/.github/workflows/publish-fdm-core.yml index 567c8c205..62c5e24dc 100644 --- a/.github/workflows/publish-fdm-core.yml +++ b/.github/workflows/publish-fdm-core.yml @@ -37,6 +37,8 @@ jobs: cache: 'pnpm' - name: Install dependencies run: pnpm install --frozen-lockfile --filter fdm-core + - name: Version with the git commit + run: pnpm version prerelease --preid ${{ github.head_ref }} # - name: Run tests # run: pnpm test - name: Publish the package From 12951f5f03e5121580c3d65939e4099208b4e554 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Fri, 25 Oct 2024 16:49:11 +0200 Subject: [PATCH 11/19] Do not tag the version --- .github/workflows/publish-fdm-core.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-fdm-core.yml b/.github/workflows/publish-fdm-core.yml index 62c5e24dc..7728c9561 100644 --- a/.github/workflows/publish-fdm-core.yml +++ b/.github/workflows/publish-fdm-core.yml @@ -37,8 +37,8 @@ jobs: cache: 'pnpm' - name: Install dependencies run: pnpm install --frozen-lockfile --filter fdm-core - - name: Version with the git commit - run: pnpm version prerelease --preid ${{ github.head_ref }} + - name: Create a development version + run: pnpm version prerelease --preid ${{ github.head_ref }} --no-git-tag-version # - name: Run tests # run: pnpm test - name: Publish the package From 432065a791cbeed5e32d4063bea8d18cbd168926 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Fri, 25 Oct 2024 16:53:41 +0200 Subject: [PATCH 12/19] Set default workspace --- .github/workflows/publish-fdm-core.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/publish-fdm-core.yml b/.github/workflows/publish-fdm-core.yml index 7728c9561..43fb8805c 100644 --- a/.github/workflows/publish-fdm-core.yml +++ b/.github/workflows/publish-fdm-core.yml @@ -1,5 +1,9 @@ name: Publish fdm-core (dev) to GitHub Packages +defaults: + run: + working-directory: ./fdm-core + on: pull_request: paths: From 4f51d1a55ae20b081de009b067ecd877a57318c2 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Fri, 25 Oct 2024 16:55:40 +0200 Subject: [PATCH 13/19] Fix? --- .github/workflows/publish-fdm-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-fdm-core.yml b/.github/workflows/publish-fdm-core.yml index 43fb8805c..70cdd3069 100644 --- a/.github/workflows/publish-fdm-core.yml +++ b/.github/workflows/publish-fdm-core.yml @@ -46,6 +46,6 @@ jobs: # - name: Run tests # run: pnpm test - name: Publish the package - run: pnpm publish fdm-core --tag ${{ github.head_ref }} --no-git-checks + run: pnpm publish --tag ${{ github.head_ref }} --no-git-checks env: NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From cb278535c8c1fce0b0bf83bf6d3ff01760a1db70 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Tue, 29 Oct 2024 09:47:19 +0100 Subject: [PATCH 14/19] Improve pre-release versioning format --- .github/workflows/publish-fdm-core.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-fdm-core.yml b/.github/workflows/publish-fdm-core.yml index 70cdd3069..2c7e4a9c2 100644 --- a/.github/workflows/publish-fdm-core.yml +++ b/.github/workflows/publish-fdm-core.yml @@ -42,7 +42,9 @@ jobs: - name: Install dependencies run: pnpm install --frozen-lockfile --filter fdm-core - name: Create a development version - run: pnpm version prerelease --preid ${{ github.head_ref }} --no-git-tag-version + uses: adobe/update-prerelease-npm-version@v1.0.0 + with: + pre-release-tag: ${{ github.head_ref }} # - name: Run tests # run: pnpm test - name: Publish the package From 5c8cb0966e968d6da94364778f2256ba5c13f156 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Tue, 29 Oct 2024 10:08:25 +0100 Subject: [PATCH 15/19] Another fix to get a development package release version --- .github/workflows/publish-fdm-core.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-fdm-core.yml b/.github/workflows/publish-fdm-core.yml index 2c7e4a9c2..af7c0bf73 100644 --- a/.github/workflows/publish-fdm-core.yml +++ b/.github/workflows/publish-fdm-core.yml @@ -41,10 +41,11 @@ jobs: cache: 'pnpm' - name: Install dependencies run: pnpm install --frozen-lockfile --filter fdm-core + - name: get-npm-version + id: package-version + uses: martinbeentjes/npm-get-version-action@v1.3.1 - name: Create a development version - uses: adobe/update-prerelease-npm-version@v1.0.0 - with: - pre-release-tag: ${{ github.head_ref }} + run: pnpm version ${{ steps.package-version.outputs.current-version}}.${{ github.head_ref }}.${{ github.sha }} --no-git-tag-version # - name: Run tests # run: pnpm test - name: Publish the package From 9fe4fe8d1028e05d78ba76e0d0a3f415a45f0e42 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Tue, 29 Oct 2024 10:13:13 +0100 Subject: [PATCH 16/19] Fix --- .github/workflows/publish-fdm-core.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-fdm-core.yml b/.github/workflows/publish-fdm-core.yml index af7c0bf73..be8284af9 100644 --- a/.github/workflows/publish-fdm-core.yml +++ b/.github/workflows/publish-fdm-core.yml @@ -44,8 +44,10 @@ jobs: - name: get-npm-version id: package-version uses: martinbeentjes/npm-get-version-action@v1.3.1 + with: + path: fdm-core - name: Create a development version - run: pnpm version ${{ steps.package-version.outputs.current-version}}.${{ github.head_ref }}.${{ github.sha }} --no-git-tag-version + run: pnpm version ${{ steps.package-version.outputs.current-version}}-${{ github.head_ref }}.${{ github.sha }} --no-git-tag-version # - name: Run tests # run: pnpm test - name: Publish the package From 0bbfce50a3959b6e79034b6c28dd062a8debcfdb Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Tue, 29 Oct 2024 10:19:51 +0100 Subject: [PATCH 17/19] Rename to prerelease --- .../workflows/{publish-fdm-core.yml => prerelease-fdm-core.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{publish-fdm-core.yml => prerelease-fdm-core.yml} (97%) diff --git a/.github/workflows/publish-fdm-core.yml b/.github/workflows/prerelease-fdm-core.yml similarity index 97% rename from .github/workflows/publish-fdm-core.yml rename to .github/workflows/prerelease-fdm-core.yml index be8284af9..2a3a1f10c 100644 --- a/.github/workflows/publish-fdm-core.yml +++ b/.github/workflows/prerelease-fdm-core.yml @@ -1,4 +1,4 @@ -name: Publish fdm-core (dev) to GitHub Packages +name: Prerelease fdm-core to GitHub Packages defaults: run: From f2925856e7886f9f07f86344990c8e5bd84cd3c8 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Tue, 29 Oct 2024 13:04:00 +0100 Subject: [PATCH 18/19] Differentiate versions between PR and main --- .github/workflows/prerelease-fdm-core.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prerelease-fdm-core.yml b/.github/workflows/prerelease-fdm-core.yml index 2a3a1f10c..ecf4a5b60 100644 --- a/.github/workflows/prerelease-fdm-core.yml +++ b/.github/workflows/prerelease-fdm-core.yml @@ -12,7 +12,7 @@ on: - main jobs: - build: + prerelease: runs-on: ubuntu-latest strategy: matrix: @@ -46,8 +46,12 @@ jobs: uses: martinbeentjes/npm-get-version-action@v1.3.1 with: path: fdm-core - - name: Create a development version + - name: Create a prerelease version from PR + if: github.head_ref != 'main' run: pnpm version ${{ steps.package-version.outputs.current-version}}-${{ github.head_ref }}.${{ github.sha }} --no-git-tag-version + - name: Create a prerelease version from main + if: github.head_ref == 'main' + run: pnpm version ${{ steps.package-version.outputs.current-version}}-${{ github.sha }} --no-git-tag-version # - name: Run tests # run: pnpm test - name: Publish the package From 9e166c7107346935227d8a6ab62e4db4cb80af5e Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Tue, 29 Oct 2024 13:04:46 +0100 Subject: [PATCH 19/19] Publish prerelease version on push to main --- .github/workflows/prerelease-fdm-core.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/prerelease-fdm-core.yml b/.github/workflows/prerelease-fdm-core.yml index ecf4a5b60..46039533b 100644 --- a/.github/workflows/prerelease-fdm-core.yml +++ b/.github/workflows/prerelease-fdm-core.yml @@ -10,6 +10,11 @@ on: - 'fdm-core/**' branches: - main + push: + paths: + - 'fdm-core/**' + branches: + - main jobs: prerelease: