From 93fb38beb404556d84bf6a013113b3e924c988c0 Mon Sep 17 00:00:00 2001 From: Lars Vierbergen Date: Fri, 11 Oct 2024 09:23:51 +0200 Subject: [PATCH] Try to publish directly from a tag instead of having to checkout main --- .github/workflows/ci.yml | 7 +------ lerna.json | 6 +++--- packages/fetch-hook-authentication/package.json | 4 ++-- packages/fetch-hooks/package.json | 2 +- packages/hal-forms/package.json | 6 +++--- packages/hal/package.json | 4 ++-- packages/problem-details/package.json | 2 +- packages/typed-fetch/package.json | 2 +- packages/uri-template/package.json | 2 +- yarn.lock | 16 ++++++++-------- 10 files changed, 23 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f0d741..26cde6f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,9 +27,4 @@ jobs: env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} run: - if git branch -a --format '%(refname:short)' --contains '${{ github.sha }}' | grep -E '^origin/main$' ; then - git checkout main; - yarn lerna publish ${{ github.ref_name }} --yes --no-push --no-git-tag-version; - else - exit 1; - fi + yarn lerna publish ${{ github.ref_name }} --yes --no-push --no-git-tag-version --force-publish diff --git a/lerna.json b/lerna.json index 828df32..e762852 100644 --- a/lerna.json +++ b/lerna.json @@ -1,10 +1,10 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "0.0.1-alpha.0", + "version": "0.0.0", "ignoreChanges": ["**/__tests/**"], "command": { - "version": { - "allowBranch": "main" + "publish": { + "exact": true } } } diff --git a/packages/fetch-hook-authentication/package.json b/packages/fetch-hook-authentication/package.json index df81ae3..4c8ed1d 100644 --- a/packages/fetch-hook-authentication/package.json +++ b/packages/fetch-hook-authentication/package.json @@ -1,6 +1,6 @@ { "name": "@contentgrid/fetch-hook-authentication", - "version": "0.0.1-alpha.0", + "version": "0.0.0", "description": "", "keywords": [ "fetch", @@ -21,7 +21,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.22.10", - "@contentgrid/fetch-hooks": "^0.0.1-alpha.0", + "@contentgrid/fetch-hooks": "^0.0.0", "@types/whatwg-mimetype": "^3.0.2", "tslib": "^2.6.1", "whatwg-mimetype": "^4.0.0" diff --git a/packages/fetch-hooks/package.json b/packages/fetch-hooks/package.json index e517c32..b96256f 100644 --- a/packages/fetch-hooks/package.json +++ b/packages/fetch-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@contentgrid/fetch-hooks", - "version": "0.0.1-alpha.0", + "version": "0.0.0", "description": "Insert hooks before/after fetch()", "keywords": [ "fetch", diff --git a/packages/hal-forms/package.json b/packages/hal-forms/package.json index 2f13994..05e0e9b 100644 --- a/packages/hal-forms/package.json +++ b/packages/hal-forms/package.json @@ -1,6 +1,6 @@ { "name": "@contentgrid/hal-forms", - "version": "0.0.1-alpha.0", + "version": "0.0.0", "description": "HAL-FORMS models", "keywords": [ "HAL-FORMS", @@ -48,8 +48,8 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.22.10", - "@contentgrid/hal": "^0.0.1-alpha.0", - "@contentgrid/typed-fetch": "^0.0.1-alpha.0", + "@contentgrid/hal": "^0.0.0", + "@contentgrid/typed-fetch": "^0.0.0", "tslib": "^2.6.1" }, "scripts": { diff --git a/packages/hal/package.json b/packages/hal/package.json index 813d657..dbb0e58 100644 --- a/packages/hal/package.json +++ b/packages/hal/package.json @@ -1,6 +1,6 @@ { "name": "@contentgrid/hal", - "version": "0.0.1-alpha.0", + "version": "0.0.0", "description": "Hypertext Application Language resource models", "keywords": [ "HAL", @@ -37,7 +37,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.22.10", - "@contentgrid/uri-template": "^0.0.1-alpha.0", + "@contentgrid/uri-template": "^0.0.0", "tslib": "^2.6.1" }, "scripts": { diff --git a/packages/problem-details/package.json b/packages/problem-details/package.json index a64537d..1376f14 100644 --- a/packages/problem-details/package.json +++ b/packages/problem-details/package.json @@ -1,6 +1,6 @@ { "name": "@contentgrid/problem-details", - "version": "0.0.1-alpha.0", + "version": "0.0.0", "description": "RFC9547 Problem Details types and helpers", "keywords": [ "RFC7807", diff --git a/packages/typed-fetch/package.json b/packages/typed-fetch/package.json index bf9eac3..941705a 100644 --- a/packages/typed-fetch/package.json +++ b/packages/typed-fetch/package.json @@ -1,6 +1,6 @@ { "name": "@contentgrid/typed-fetch", - "version": "0.0.1-alpha.0", + "version": "0.0.0", "description": "Add typing information to fetch() requests and responses", "keywords": [ "fetch", diff --git a/packages/uri-template/package.json b/packages/uri-template/package.json index 99961db..84a10b4 100644 --- a/packages/uri-template/package.json +++ b/packages/uri-template/package.json @@ -1,6 +1,6 @@ { "name": "@contentgrid/uri-template", - "version": "0.0.1-alpha.0", + "version": "0.0.0", "description": "RFC6570 URI template parser and expander", "keywords": [ "RFC6570", diff --git a/yarn.lock b/yarn.lock index 18a3ec5..6122e87 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1499,14 +1499,14 @@ __metadata: resolution: "@contentgrid/fetch-hook-authentication@workspace:packages/fetch-hook-authentication" dependencies: "@babel/runtime": "npm:^7.22.10" - "@contentgrid/fetch-hooks": "npm:^0.0.1-alpha.0" + "@contentgrid/fetch-hooks": "npm:^0.0.0" "@types/whatwg-mimetype": "npm:^3.0.2" tslib: "npm:^2.6.1" whatwg-mimetype: "npm:^4.0.0" languageName: unknown linkType: soft -"@contentgrid/fetch-hooks@npm:^0.0.1-alpha.0, @contentgrid/fetch-hooks@workspace:packages/fetch-hooks": +"@contentgrid/fetch-hooks@npm:^0.0.0, @contentgrid/fetch-hooks@workspace:packages/fetch-hooks": version: 0.0.0-use.local resolution: "@contentgrid/fetch-hooks@workspace:packages/fetch-hooks" dependencies: @@ -1521,18 +1521,18 @@ __metadata: resolution: "@contentgrid/hal-forms@workspace:packages/hal-forms" dependencies: "@babel/runtime": "npm:^7.22.10" - "@contentgrid/hal": "npm:^0.0.1-alpha.0" - "@contentgrid/typed-fetch": "npm:^0.0.1-alpha.0" + "@contentgrid/hal": "npm:^0.0.0" + "@contentgrid/typed-fetch": "npm:^0.0.0" tslib: "npm:^2.6.1" languageName: unknown linkType: soft -"@contentgrid/hal@npm:^0.0.1-alpha.0, @contentgrid/hal@workspace:packages/hal": +"@contentgrid/hal@npm:^0.0.0, @contentgrid/hal@workspace:packages/hal": version: 0.0.0-use.local resolution: "@contentgrid/hal@workspace:packages/hal" dependencies: "@babel/runtime": "npm:^7.22.10" - "@contentgrid/uri-template": "npm:^0.0.1-alpha.0" + "@contentgrid/uri-template": "npm:^0.0.0" tslib: "npm:^2.6.1" languageName: unknown linkType: soft @@ -1546,7 +1546,7 @@ __metadata: languageName: unknown linkType: soft -"@contentgrid/typed-fetch@npm:^0.0.1-alpha.0, @contentgrid/typed-fetch@workspace:packages/typed-fetch": +"@contentgrid/typed-fetch@npm:^0.0.0, @contentgrid/typed-fetch@workspace:packages/typed-fetch": version: 0.0.0-use.local resolution: "@contentgrid/typed-fetch@workspace:packages/typed-fetch" dependencies: @@ -1556,7 +1556,7 @@ __metadata: languageName: unknown linkType: soft -"@contentgrid/uri-template@npm:^0.0.1-alpha.0, @contentgrid/uri-template@workspace:packages/uri-template": +"@contentgrid/uri-template@npm:^0.0.0, @contentgrid/uri-template@workspace:packages/uri-template": version: 0.0.0-use.local resolution: "@contentgrid/uri-template@workspace:packages/uri-template" dependencies: