Skip to content

Commit 69b8a3c

Browse files
authored
Merge pull request #433 from IQSS/fix-package-dependencies
fix client package self-reference and alpha publish workflow
2 parents 6042b29 + 228424e commit 69b8a3c

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

.github/workflows/deploy_alpha.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,19 @@ jobs:
7171
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7272
run: |
7373
echo "//npm.pkg.github.com/:_authToken=${{ secrets.GITHUB_TOKEN }}" > ~/.npmrc
74+
CURRENT_PACKAGE_VERSION=$(jq -r '.version' package.json)
75+
BASE_VERSION=${CURRENT_PACKAGE_VERSION%%-alpha.*}
7476
75-
LATEST_VERSION=$(npm show @IQSS/dataverse-client-javascript versions --registry=https://npm.pkg.github.com/ --json | jq -r '.[]' | grep "^2.0.0-alpha." | sort -V | tail -n 1)
77+
LATEST_VERSION=$(npm show @iqss/dataverse-client-javascript versions --registry=https://npm.pkg.github.com/ --json | jq -r '.[]' | grep "^${BASE_VERSION}-alpha\\." | sort -V | tail -n 1)
7678
7779
if [ -z "$LATEST_VERSION" ]; then
7880
NEW_INCREMENTAL_NUMBER=1
7981
else
80-
CURRENT_INCREMENTAL_NUMBER=$(echo $LATEST_VERSION | sed 's/2.0.0-alpha.//')
82+
CURRENT_INCREMENTAL_NUMBER=$(echo "$LATEST_VERSION" | sed "s/^${BASE_VERSION}-alpha\\.//")
8183
NEW_INCREMENTAL_NUMBER=$((CURRENT_INCREMENTAL_NUMBER + 1))
8284
fi
8385
84-
NEW_VERSION="2.0.0-alpha.${NEW_INCREMENTAL_NUMBER}"
86+
NEW_VERSION="${BASE_VERSION}-alpha.${NEW_INCREMENTAL_NUMBER}"
8587
8688
echo "Latest version: $LATEST_VERSION"
8789
echo "New version: $NEW_VERSION"
@@ -92,7 +94,6 @@ jobs:
9294
- name: Publish package
9395
run: |
9496
echo "$(jq '.publishConfig.registry = "https://npm.pkg.github.com"' package.json)" > package.json
95-
echo "$( jq '.name = "@IQSS/dataverse-client-javascript"' package.json )" > package.json
96-
npm publish --@IQSS:registry=https://npm.pkg.github.com
97+
npm publish --@iqss:registry=https://npm.pkg.github.com
9798
env:
9899
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/deploy_pr.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ jobs:
7373
- name: Publish package
7474
run: |
7575
echo "$(jq '.publishConfig.registry = "https://npm.pkg.github.com"' package.json)" > package.json
76-
echo "$( jq '.name = "@IQSS/dataverse-client-javascript"' package.json )" > package.json
77-
npm publish --@IQSS:registry=https://npm.pkg.github.com
76+
npm publish --@iqss:registry=https://npm.pkg.github.com
7877
env:
7978
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
"ts-node": "^10.9.2"
5858
},
5959
"dependencies": {
60-
"@iqss/dataverse-client-javascript": "^2.1.0",
6160
"@types/node": "^18.15.11",
6261
"@types/turndown": "^5.0.1",
6362
"axios": "^1.12.2",

0 commit comments

Comments
 (0)