From 8ccf38d23934390bdb16619376ae78513f3ebf83 Mon Sep 17 00:00:00 2001 From: GPortas Date: Thu, 18 May 2023 11:23:25 +0100 Subject: [PATCH 01/16] Added: github pckgs setup --- .github/workflows/deploy_to_github.yml | 29 ++++++++++++++++++++++++++ package.json | 13 +++++++----- 2 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/deploy_to_github.yml diff --git a/.github/workflows/deploy_to_github.yml b/.github/workflows/deploy_to_github.yml new file mode 100644 index 00000000..69f4074e --- /dev/null +++ b/.github/workflows/deploy_to_github.yml @@ -0,0 +1,29 @@ +name: deploy_to_github + +on: + push: + pull_request: + branches: + - develop + +jobs: + install-and-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 19 + - run: npm install + - run: npm test + publish-package: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 19 + registry-url: https://npm.pkg.github.com/ + - run: npm publish + env: + NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/package.json b/package.json index cdd257d6..59af841f 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,12 @@ { - "name": "js-dataverse", + "name": "GPortas/dataverse-client-javascript", + "repository": { + "type": "git", + "url": "git+https://github.com/GPortas/dataverse-client-javascript.git" + }, + "publishConfig": { + "@GPortas:registry": "https://npm.pkg.github.com" + }, "version": "2.0.0", "description": "Dataverse API wrapper package for JavaScript/TypeScript-based applications", "main": "./dist/index.js", @@ -18,10 +25,6 @@ "lint": "eslint src --ext .js,.ts", "lint:fix": "eslint src --fix --ext .js,.ts" }, - "repository": { - "type": "git", - "url": "git+https://github.com/IQSS/dataverse-client-javascript.git" - }, "keywords": [ "dataverse" ], From db10a8852472be06d775cdfd1735af9ffd61b1a8 Mon Sep 17 00:00:00 2001 From: GPortas Date: Thu, 18 May 2023 11:29:05 +0100 Subject: [PATCH 02/16] Fixed: env name --- .github/workflows/deploy_to_github.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_to_github.yml b/.github/workflows/deploy_to_github.yml index 69f4074e..3431c194 100644 --- a/.github/workflows/deploy_to_github.yml +++ b/.github/workflows/deploy_to_github.yml @@ -26,4 +26,4 @@ jobs: registry-url: https://npm.pkg.github.com/ - run: npm publish env: - NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} + NPM_CONFIG_TOKEN: ${{secrets.GITHUB_TOKEN}} From 3d00edbbe412bac8e2d7e5ac6876843a7cb6383c Mon Sep 17 00:00:00 2001 From: GPortas Date: Thu, 18 May 2023 11:33:20 +0100 Subject: [PATCH 03/16] Fixed: package name --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 59af841f..eaae2c0e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "GPortas/dataverse-client-javascript", + "name": "@gportas/dataverse-client-javascript", "repository": { "type": "git", "url": "git+https://github.com/GPortas/dataverse-client-javascript.git" From e33dddb6ccc5a0951fa8c3411a2cbbcf978fd3fb Mon Sep 17 00:00:00 2001 From: GPortas Date: Thu, 18 May 2023 11:38:50 +0100 Subject: [PATCH 04/16] Fixed: token --- .github/workflows/deploy_to_github.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_to_github.yml b/.github/workflows/deploy_to_github.yml index 3431c194..7ff43084 100644 --- a/.github/workflows/deploy_to_github.yml +++ b/.github/workflows/deploy_to_github.yml @@ -26,4 +26,4 @@ jobs: registry-url: https://npm.pkg.github.com/ - run: npm publish env: - NPM_CONFIG_TOKEN: ${{secrets.GITHUB_TOKEN}} + NPM_CONFIG_TOKEN: ${{ github.token }} From 72f3a7385c6076c8623d828e9daababe97459f20 Mon Sep 17 00:00:00 2001 From: GPortas Date: Thu, 18 May 2023 11:44:17 +0100 Subject: [PATCH 05/16] Fixed: deploy_to_github --- .github/workflows/deploy_to_github.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy_to_github.yml b/.github/workflows/deploy_to_github.yml index 7ff43084..5e3c2363 100644 --- a/.github/workflows/deploy_to_github.yml +++ b/.github/workflows/deploy_to_github.yml @@ -7,23 +7,32 @@ on: - develop jobs: - install-and-test: + build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: node-version: 19 - - run: npm install + - run: npm ci - run: npm test - publish-package: + + publish-gpr: + needs: build runs-on: ubuntu-latest + permissions: + packages: write + contents: read steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: node-version: 19 registry-url: https://npm.pkg.github.com/ + - run: npm ci + - run: | + echo "@GPortas:registry=https://npm.pkg.github.com" >> .npmrc + echo "//npm.pkg.github.com/:_authToken=${{ secrets.GITHUB_TOKEN }}" >> .npmrc - run: npm publish env: - NPM_CONFIG_TOKEN: ${{ github.token }} + NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} From fdb449d65c01892d641f5e56afec4830b6f139b7 Mon Sep 17 00:00:00 2001 From: GPortas Date: Thu, 18 May 2023 11:46:37 +0100 Subject: [PATCH 06/16] Fixed: format --- .github/workflows/deploy_to_github.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_to_github.yml b/.github/workflows/deploy_to_github.yml index 5e3c2363..547d4e2e 100644 --- a/.github/workflows/deploy_to_github.yml +++ b/.github/workflows/deploy_to_github.yml @@ -7,7 +7,7 @@ on: - develop jobs: - build: + build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From 91fa95788f4bd28652c42dfd9744289260e3fe7b Mon Sep 17 00:00:00 2001 From: GPortas Date: Thu, 18 May 2023 11:52:10 +0100 Subject: [PATCH 07/16] Fixed: action --- .github/workflows/deploy_to_github.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy_to_github.yml b/.github/workflows/deploy_to_github.yml index 547d4e2e..c53fa820 100644 --- a/.github/workflows/deploy_to_github.yml +++ b/.github/workflows/deploy_to_github.yml @@ -1,7 +1,6 @@ name: deploy_to_github on: - push: pull_request: branches: - develop From 81bccd4d22ca633580b23cc25aa596c51ae478df Mon Sep 17 00:00:00 2001 From: GPortas Date: Thu, 18 May 2023 12:25:12 +0100 Subject: [PATCH 08/16] renamed job --- .github/workflows/deploy_to_github.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy_to_github.yml b/.github/workflows/deploy_to_github.yml index c53fa820..fbac30cb 100644 --- a/.github/workflows/deploy_to_github.yml +++ b/.github/workflows/deploy_to_github.yml @@ -6,7 +6,7 @@ on: - develop jobs: - build: + test: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -14,10 +14,10 @@ jobs: with: node-version: 19 - run: npm ci - - run: npm test + - run: npm run test:unit publish-gpr: - needs: build + needs: test runs-on: ubuntu-latest permissions: packages: write From 696108dc649fc06f8e0ed67a60d00c6e158979b2 Mon Sep 17 00:00:00 2001 From: GPortas Date: Thu, 18 May 2023 12:46:18 +0100 Subject: [PATCH 09/16] Change env var --- .github/workflows/deploy_to_github.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy_to_github.yml b/.github/workflows/deploy_to_github.yml index fbac30cb..91fbbdee 100644 --- a/.github/workflows/deploy_to_github.yml +++ b/.github/workflows/deploy_to_github.yml @@ -31,7 +31,7 @@ jobs: - run: npm ci - run: | echo "@GPortas:registry=https://npm.pkg.github.com" >> .npmrc - echo "//npm.pkg.github.com/:_authToken=${{ secrets.GITHUB_TOKEN }}" >> .npmrc + echo "//npm.pkg.github.com/:_authToken=${ NPM_TOKEN }" >> .npmrc - run: npm publish env: - NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} + NPM_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 2da56cb82751a804b5add66f46b7c440803a2a1d Mon Sep 17 00:00:00 2001 From: GPortas Date: Thu, 18 May 2023 12:49:16 +0100 Subject: [PATCH 10/16] fix --- .github/workflows/deploy_to_github.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy_to_github.yml b/.github/workflows/deploy_to_github.yml index 91fbbdee..b88f6135 100644 --- a/.github/workflows/deploy_to_github.yml +++ b/.github/workflows/deploy_to_github.yml @@ -30,8 +30,8 @@ jobs: registry-url: https://npm.pkg.github.com/ - run: npm ci - run: | - echo "@GPortas:registry=https://npm.pkg.github.com" >> .npmrc - echo "//npm.pkg.github.com/:_authToken=${ NPM_TOKEN }" >> .npmrc + echo @GPortas:https://npm.pkg.github.com/ >> .npmrc + echo '//npm.pkg.github.com/:_authToken=${NPM_TOKEN}' >> .npmrc - run: npm publish env: NPM_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 9aa6b13d0fc81a3386f7a328a0b2a35d380af92f Mon Sep 17 00:00:00 2001 From: GPortas Date: Thu, 18 May 2023 13:01:19 +0100 Subject: [PATCH 11/16] test remove version --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index eaae2c0e..ed8dc845 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "publishConfig": { "@GPortas:registry": "https://npm.pkg.github.com" }, - "version": "2.0.0", "description": "Dataverse API wrapper package for JavaScript/TypeScript-based applications", "main": "./dist/index.js", "types": "./dist/index.d.ts", From 7c448330929f2be2852573703c11d8b88e7a37ba Mon Sep 17 00:00:00 2001 From: GPortas Date: Thu, 18 May 2023 13:05:28 +0100 Subject: [PATCH 12/16] fix --- .github/workflows/deploy_to_github.yml | 2 +- package.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy_to_github.yml b/.github/workflows/deploy_to_github.yml index b88f6135..a4ea0a28 100644 --- a/.github/workflows/deploy_to_github.yml +++ b/.github/workflows/deploy_to_github.yml @@ -32,6 +32,6 @@ jobs: - run: | echo @GPortas:https://npm.pkg.github.com/ >> .npmrc echo '//npm.pkg.github.com/:_authToken=${NPM_TOKEN}' >> .npmrc - - run: npm publish + - run: npm publish --tag ${{ github.head_ref }} env: NPM_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/package.json b/package.json index ed8dc845..eaae2c0e 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "publishConfig": { "@GPortas:registry": "https://npm.pkg.github.com" }, + "version": "2.0.0", "description": "Dataverse API wrapper package for JavaScript/TypeScript-based applications", "main": "./dist/index.js", "types": "./dist/index.d.ts", From ed31c5e53af8a0c8c407c71f5325cf07f3b7a787 Mon Sep 17 00:00:00 2001 From: GPortas Date: Thu, 18 May 2023 13:08:18 +0100 Subject: [PATCH 13/16] test --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eaae2c0e..4a2ae105 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "publishConfig": { "@GPortas:registry": "https://npm.pkg.github.com" }, - "version": "2.0.0", + "version": "59-dataset-info-use-cases", "description": "Dataverse API wrapper package for JavaScript/TypeScript-based applications", "main": "./dist/index.js", "types": "./dist/index.d.ts", From 8533a5f2715f23cfac675d595d711940420d6d56 Mon Sep 17 00:00:00 2001 From: GPortas Date: Thu, 18 May 2023 13:23:23 +0100 Subject: [PATCH 14/16] teat --- .github/workflows/deploy_to_github.yml | 4 +++- package.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy_to_github.yml b/.github/workflows/deploy_to_github.yml index a4ea0a28..a4d88635 100644 --- a/.github/workflows/deploy_to_github.yml +++ b/.github/workflows/deploy_to_github.yml @@ -28,10 +28,12 @@ jobs: with: node-version: 19 registry-url: https://npm.pkg.github.com/ + - run: npm version ${ PR_NUMBER }.0.0 --no-git-tag-version - run: npm ci - run: | echo @GPortas:https://npm.pkg.github.com/ >> .npmrc - echo '//npm.pkg.github.com/:_authToken=${NPM_TOKEN}' >> .npmrc + echo '//npm.pkg.github.com/:_authToken=${ NPM_TOKEN }' >> .npmrc - run: npm publish --tag ${{ github.head_ref }} env: NPM_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PR_NUMBER: ${{ github.event.number }} diff --git a/package.json b/package.json index 4a2ae105..eaae2c0e 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "publishConfig": { "@GPortas:registry": "https://npm.pkg.github.com" }, - "version": "59-dataset-info-use-cases", + "version": "2.0.0", "description": "Dataverse API wrapper package for JavaScript/TypeScript-based applications", "main": "./dist/index.js", "types": "./dist/index.d.ts", From bbdda01b93863655a3c9d6a4a55c1bc53fac0428 Mon Sep 17 00:00:00 2001 From: GPortas Date: Thu, 18 May 2023 13:26:26 +0100 Subject: [PATCH 15/16] fix --- .github/workflows/deploy_to_github.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_to_github.yml b/.github/workflows/deploy_to_github.yml index a4d88635..d954e5ce 100644 --- a/.github/workflows/deploy_to_github.yml +++ b/.github/workflows/deploy_to_github.yml @@ -28,7 +28,7 @@ jobs: with: node-version: 19 registry-url: https://npm.pkg.github.com/ - - run: npm version ${ PR_NUMBER }.0.0 --no-git-tag-version + - run: npm version '${ PR_NUMBER }.0.0' --no-git-tag-version - run: npm ci - run: | echo @GPortas:https://npm.pkg.github.com/ >> .npmrc From 5f8ab5ddf5a709e4cb53edd0c98ed3a3cefa82a4 Mon Sep 17 00:00:00 2001 From: GPortas Date: Tue, 23 May 2023 15:11:38 +0100 Subject: [PATCH 16/16] Removed: action --- .github/workflows/deploy_to_github.yml | 39 -------------------------- 1 file changed, 39 deletions(-) delete mode 100644 .github/workflows/deploy_to_github.yml diff --git a/.github/workflows/deploy_to_github.yml b/.github/workflows/deploy_to_github.yml deleted file mode 100644 index d954e5ce..00000000 --- a/.github/workflows/deploy_to_github.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: deploy_to_github - -on: - pull_request: - branches: - - develop - -jobs: - test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: 19 - - run: npm ci - - run: npm run test:unit - - publish-gpr: - needs: test - runs-on: ubuntu-latest - permissions: - packages: write - contents: read - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: 19 - registry-url: https://npm.pkg.github.com/ - - run: npm version '${ PR_NUMBER }.0.0' --no-git-tag-version - - run: npm ci - - run: | - echo @GPortas:https://npm.pkg.github.com/ >> .npmrc - echo '//npm.pkg.github.com/:_authToken=${ NPM_TOKEN }' >> .npmrc - - run: npm publish --tag ${{ github.head_ref }} - env: - NPM_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PR_NUMBER: ${{ github.event.number }}