diff --git a/.github/workflows/build_and_publish.yml b/.github/workflows/build_and_publish.yml index d0f48f8..bc45bc7 100644 --- a/.github/workflows/build_and_publish.yml +++ b/.github/workflows/build_and_publish.yml @@ -1,60 +1,61 @@ name: Build jsgeoda -on: [push] +on: [push, pull_request] jobs: build: - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [12.x] - permissions: packages: write contents: read - steps: - - uses: actions/checkout@v2 - - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v2 - with: - node-version: ${{ matrix.node-version }} - registry-url: https://npm.pkg.github.com/ - scope: '@geodacenter' - - - name: Build&Test jsgeoda - run: | - npm install - npm run build --if-present - npm test - env: - # replace ${GITHUB_TOKEN} in .npmrc - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - - # Publish to GitHub Package Registry - - name: Publish to GitHub Package Registry - # Only when release - if: startsWith(github.ref, 'refs/tags/v') - run: | - npm publish - env: - # replace ${GITHUB_TOKEN} in .npmrc - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - - # Publish to NPM registry - - name: Use Node.js ${{ matrix.node-version }} for NPM - uses: actions/setup-node@v2 - with: - node-version: ${{ matrix.node-version }} - registry-url: https://registry.npmjs.org/ - - - name: Publish to NPM Registry - run: | - rm .npmrc - echo //registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN > .npmrc - npm publish --access public - env: - NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} + - uses: actions/checkout@v2 + - uses: actions/setup-node@v2 + with: + node-version: 12 + - name: Build&Test jsgeoda + run: | + npm install + npm run build --if-present + npm test + + publish-npm: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v2 + with: + node-version: 12 + registry-url: https://registry.npmjs.org/ + - name: publis-npm + if: startsWith(github.ref, 'refs/tags/v') + run: | + npm install + npm run build + npm publish --access public + env: + NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} + + publish-gpr: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v2 + with: + node-version: 12 + registry-url: https://npm.pkg.github.com/ + scope: '@geodacenter' + - name: publish-gpr + if: startsWith(github.ref, 'refs/tags/v') + run: | + npm install + npm run build + echo //npm.pkg.github.com/:_authToken=${GITHUB_TOKEN} > .npmrc + echo @geodacenter:registry=https://npm.pkg.github.com >> .npmrc + echo always-auth=true >> .npmrc + npm publish + env: + # replace ${GITHUB_TOKEN} in .npmrc + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/.npmrc b/.npmrc deleted file mode 100644 index 164db61..0000000 --- a/.npmrc +++ /dev/null @@ -1,3 +0,0 @@ -//npm.pkg.github.com/:_authToken=${GITHUB_TOKEN} -@geodacenter:registry=https://npm.pkg.github.com -always-auth=true diff --git a/package.json b/package.json index 8825bc1..16c0bd4 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "serve": "http-server", "start": "npm run build && npm run serve", "doc": "jsdoc -d docs --configure jsconf.json --readme README.md", - "publish": "npm run build:bundle && npm publish --access public", "test": "tape tests/**/*.js" }, "devDependencies": { @@ -65,8 +64,5 @@ }, "engines": { "node": ">=12" - }, - "publishConfig": { - "@geodacenter:registry": "https://npm.pkg.github.com" } }