From e92b31ce1cbcbdea8d63421032b9afaa9deaf058 Mon Sep 17 00:00:00 2001 From: Leandro Costa Date: Fri, 30 May 2025 07:57:38 -0300 Subject: [PATCH 01/13] feat: disable mirror --- .forgejo/workflows/build.yml | 38 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 350c58e..b25e3f9 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -73,27 +73,27 @@ jobs: echo "version_changed=false" >> "$GITHUB_OUTPUT" fi - mirror: - runs-on: docker - needs: [build-and-test, check-version] - container: - image: node:20-alpine - steps: - - name: Instalando dependencias - run: | - apk add git + # mirror: + # runs-on: docker + # needs: [build-and-test, check-version] + # container: + # image: node:20-alpine + # steps: + # - name: Instalando dependencias + # run: | + # apk add git - - name: Checkout código - uses: actions/checkout@v4 - with: - fetch-depth: 0 # ✅ clone completo + # - name: Checkout código + # uses: actions/checkout@v4 + # with: + # fetch-depth: 0 # ✅ clone completo - - name: Push para o repositório espelho - run: | - git remote add bitbucket https://leandro_costa:${BITBUCKET_TOKEN}@bitbucket.org/leandro_costa/lhmask.git - git push --force bitbucket HEAD - env: - BITBUCKET_TOKEN: ${{ secrets.BITBUCKET_TOKEN }} + # - name: Push para o repositório espelho + # run: | + # git remote add bitbucket https://leandro_costa:${BITBUCKET_TOKEN}@bitbucket.org/leandro_costa/lhmask.git + # git push --force bitbucket HEAD + # env: + # BITBUCKET_TOKEN: ${{ secrets.BITBUCKET_TOKEN }} publish-staging: runs-on: docker From 0ff5d9a19856274fe5a5aa8ffdcd99214dc741fe Mon Sep 17 00:00:00 2001 From: Leandro Costa Date: Fri, 30 May 2025 08:03:02 -0300 Subject: [PATCH 02/13] feat: remove dead code --- .forgejo/workflows/build.yml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index b25e3f9..8c351e5 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -73,28 +73,6 @@ jobs: echo "version_changed=false" >> "$GITHUB_OUTPUT" fi - # mirror: - # runs-on: docker - # needs: [build-and-test, check-version] - # container: - # image: node:20-alpine - # steps: - # - name: Instalando dependencias - # run: | - # apk add git - - # - name: Checkout código - # uses: actions/checkout@v4 - # with: - # fetch-depth: 0 # ✅ clone completo - - # - name: Push para o repositório espelho - # run: | - # git remote add bitbucket https://leandro_costa:${BITBUCKET_TOKEN}@bitbucket.org/leandro_costa/lhmask.git - # git push --force bitbucket HEAD - # env: - # BITBUCKET_TOKEN: ${{ secrets.BITBUCKET_TOKEN }} - publish-staging: runs-on: docker needs: [mirror] From c9e439fc666c4329923fd0717cacb1bb79812ff8 Mon Sep 17 00:00:00 2001 From: Leandro Costa Date: Fri, 30 May 2025 08:22:45 -0300 Subject: [PATCH 03/13] feat: publish to git repo --- .forgejo/workflows/build.yml | 19 +++++++++++++++++++ package.json | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 8c351e5..8d89b8d 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -115,10 +115,29 @@ jobs: env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + publish-git: + runs-on: docker + container: + image: ubuntu:latest + needs: [build-and-test] + steps: + - uses: actions/setup-node@v4 + with: + node-version: "20.x" + registry-url: "https://git.lhprovedor.com.br/leandro/lhmask/packages/npm/" + - name: Download lhmask + uses: actions/download-artifact@v3 + with: + path: lhmask + name: lhmask + finish: runs-on: docker + needs: [publish-staging, publish-production, publish-git] container: image: node:20-alpine steps: - name: Finish task run: echo Done + - name: Publish to Git + run: npm publish diff --git a/package.json b/package.json index 7a1dd7b..1ea122a 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ }, "repository": { "type": "git", - "url": "git+ssh://git@bitbucket.org/leandro_costa/lhmask.git" + "url": "https://git.lhprovedor.com.br/leandro/lhmask.git" }, "keywords": [], "author": "", From f356b7e34291c1682bc148a5ae032a4bfb24dbf1 Mon Sep 17 00:00:00 2001 From: Leandro Costa Date: Fri, 30 May 2025 08:26:48 -0300 Subject: [PATCH 04/13] fix: image name --- .forgejo/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 8d89b8d..d7d18f5 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -118,7 +118,7 @@ jobs: publish-git: runs-on: docker container: - image: ubuntu:latest + image: ubuntu-latest needs: [build-and-test] steps: - uses: actions/setup-node@v4 From 1bf323e0c5174b0514108b9961e9778f38484e29 Mon Sep 17 00:00:00 2001 From: Leandro Costa Date: Fri, 30 May 2025 08:34:44 -0300 Subject: [PATCH 05/13] fix: update node image --- .forgejo/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index d7d18f5..25e7dc6 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -118,7 +118,7 @@ jobs: publish-git: runs-on: docker container: - image: ubuntu-latest + image: node:20-alpine needs: [build-and-test] steps: - uses: actions/setup-node@v4 @@ -130,6 +130,10 @@ jobs: with: path: lhmask name: lhmask + - name: Publish to NPM (staging) + run: | + cd lhmask + npm publish finish: runs-on: docker From 6d9301dd1728dc39285b4339b020224062145526 Mon Sep 17 00:00:00 2001 From: Leandro Costa Date: Fri, 30 May 2025 09:14:59 -0300 Subject: [PATCH 06/13] fix: removendo setup node --- .forgejo/workflows/build.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 25e7dc6..16c0d78 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -125,12 +125,7 @@ jobs: with: node-version: "20.x" registry-url: "https://git.lhprovedor.com.br/leandro/lhmask/packages/npm/" - - name: Download lhmask - uses: actions/download-artifact@v3 - with: - path: lhmask - name: lhmask - - name: Publish to NPM (staging) + - name: Publish to Git run: | cd lhmask npm publish From 360bee2d63e5b06a926c00e43a3b8a1adbac58a6 Mon Sep 17 00:00:00 2001 From: Leandro Costa Date: Fri, 30 May 2025 09:18:15 -0300 Subject: [PATCH 07/13] feat: publish package --- .forgejo/workflows/build.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 16c0d78..b43f522 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -121,12 +121,14 @@ jobs: image: node:20-alpine needs: [build-and-test] steps: - - uses: actions/setup-node@v4 + - name: Download lhmask + uses: actions/download-artifact@v3 with: - node-version: "20.x" - registry-url: "https://git.lhprovedor.com.br/leandro/lhmask/packages/npm/" + path: lhmask + name: lhmask - name: Publish to Git run: | + npm config set -- '//git.lhprovedor.com.br/api/packages/leandro/npm/:_authToken' "{{secrets.PACKAGE_PUBLISHER_TOKEN}}" cd lhmask npm publish From 998a2b22ad8a806084c160fdcd2ac50daae97e06 Mon Sep 17 00:00:00 2001 From: Leandro Costa Date: Fri, 30 May 2025 09:20:57 -0300 Subject: [PATCH 08/13] feat: set registry --- .forgejo/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index b43f522..40b5489 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -128,6 +128,7 @@ jobs: name: lhmask - name: Publish to Git run: | + npm config set registry https://git.lhprovedor.com.br/api/packages/leandro/npm/ npm config set -- '//git.lhprovedor.com.br/api/packages/leandro/npm/:_authToken' "{{secrets.PACKAGE_PUBLISHER_TOKEN}}" cd lhmask npm publish From 52e2f85c2d3f909b19b2c6ec14366651a2628f3b Mon Sep 17 00:00:00 2001 From: Leandro Costa Date: Fri, 30 May 2025 09:27:55 -0300 Subject: [PATCH 09/13] fix: set npm_token --- .forgejo/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 40b5489..9cddd57 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -129,9 +129,11 @@ jobs: - name: Publish to Git run: | npm config set registry https://git.lhprovedor.com.br/api/packages/leandro/npm/ - npm config set -- '//git.lhprovedor.com.br/api/packages/leandro/npm/:_authToken' "{{secrets.PACKAGE_PUBLISHER_TOKEN}}" + npm config set -- '//git.lhprovedor.com.br/api/packages/leandro/npm/:_authToken' "${NPM_TOKEN}" cd lhmask npm publish + env: + NPM_TOKEN: ${{ secrets.PACKAGE_PUBLISHER_TOKEN }} finish: runs-on: docker From 2cc916cdb8547d54728a956d8fd6907bb12416d9 Mon Sep 17 00:00:00 2001 From: Leandro Costa Date: Fri, 30 May 2025 09:36:35 -0300 Subject: [PATCH 10/13] feat: ajusta publish de production --- .forgejo/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 9cddd57..144c5dc 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -126,6 +126,11 @@ jobs: with: path: lhmask name: lhmask + - name: Ajusta nome do pacote + if: github.ref == 'refs/heads/master' + run: | + cd lhmask + sed -i "s/-dev//g" package.json - name: Publish to Git run: | npm config set registry https://git.lhprovedor.com.br/api/packages/leandro/npm/ From 20dc36862c597edb41f6dea4ac79a6db5d2556fe Mon Sep 17 00:00:00 2001 From: Leandro Costa Date: Fri, 30 May 2025 09:40:36 -0300 Subject: [PATCH 11/13] feat: publish only if version changed --- .forgejo/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 144c5dc..07f479e 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -132,6 +132,7 @@ jobs: cd lhmask sed -i "s/-dev//g" package.json - name: Publish to Git + if: needs.check-version.outputs.version_changed == 'true' run: | npm config set registry https://git.lhprovedor.com.br/api/packages/leandro/npm/ npm config set -- '//git.lhprovedor.com.br/api/packages/leandro/npm/:_authToken' "${NPM_TOKEN}" From 42d7d9eea079c0b21b8fbb51d455599407627456 Mon Sep 17 00:00:00 2001 From: Leandro Costa Date: Fri, 30 May 2025 09:44:08 -0300 Subject: [PATCH 12/13] fix: movendo if para o job publish-git --- .forgejo/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 07f479e..e4d8d51 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -120,6 +120,7 @@ jobs: container: image: node:20-alpine needs: [build-and-test] + if: needs.check-version.outputs.version_changed == 'true' steps: - name: Download lhmask uses: actions/download-artifact@v3 @@ -132,7 +133,6 @@ jobs: cd lhmask sed -i "s/-dev//g" package.json - name: Publish to Git - if: needs.check-version.outputs.version_changed == 'true' run: | npm config set registry https://git.lhprovedor.com.br/api/packages/leandro/npm/ npm config set -- '//git.lhprovedor.com.br/api/packages/leandro/npm/:_authToken' "${NPM_TOKEN}" @@ -143,7 +143,7 @@ jobs: finish: runs-on: docker - needs: [publish-staging, publish-production, publish-git] + needs: [publish-staging, publish-production, publish-git, build-and-test] container: image: node:20-alpine steps: From 0b482f85d8dab03b6024d88bb72c294110d1057a Mon Sep 17 00:00:00 2001 From: Leandro Costa Date: Fri, 30 May 2025 09:46:59 -0300 Subject: [PATCH 13/13] ci: organizando publish --- .forgejo/workflows/build.yml | 46 ++++++++++-------------------------- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index e4d8d51..c7bd222 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -73,12 +73,12 @@ jobs: echo "version_changed=false" >> "$GITHUB_OUTPUT" fi - publish-staging: + publish-to-npm: runs-on: docker needs: [mirror] container: image: node:20-alpine - if: needs.check-version.outputs.version_changed == 'true' && (github.ref == 'refs/heads/development' || startsWith(github.ref, 'refs/heads/release-no-verify/')) + if: needs.check-version.outputs.version_changed == 'true' && (github.ref == 'refs/heads/development' || github.ref == 'refs/heads/master') steps: - name: Download lhmask uses: actions/download-artifact@v3 @@ -86,6 +86,10 @@ jobs: path: lhmask name: lhmask + - name: Ajusta nome do pacote + if: github.ref == 'refs/heads/master' + run: sed -i "s/-dev//g" lhmask/package.json + - name: Publish to NPM (staging) run: | cd lhmask @@ -93,45 +97,24 @@ jobs: npm publish env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - publish-production: - runs-on: docker - needs: [mirror] - container: - image: node:20-alpine - if: needs.check-version.outputs.version_changed == 'true' && github.ref == 'refs/heads/master' - steps: - - name: Download lhmask - uses: actions/download-artifact@v3 - with: - path: lhmask - name: lhmask - - name: Publish to NPM (staging) - run: | - cd lhmask - sed -i "s/-dev//g" package.json - echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc - npm publish - env: - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - - publish-git: + publish-to-git: runs-on: docker container: image: node:20-alpine needs: [build-and-test] - if: needs.check-version.outputs.version_changed == 'true' + if: needs.check-version.outputs.version_changed == 'true' && (github.ref == 'refs/heads/development' || github.ref == 'refs/heads/master') steps: - name: Download lhmask uses: actions/download-artifact@v3 with: path: lhmask name: lhmask + - name: Ajusta nome do pacote if: github.ref == 'refs/heads/master' - run: | - cd lhmask - sed -i "s/-dev//g" package.json + run: sed -i "s/-dev//g" lhmask/package.json + - name: Publish to Git run: | npm config set registry https://git.lhprovedor.com.br/api/packages/leandro/npm/ @@ -143,11 +126,8 @@ jobs: finish: runs-on: docker - needs: [publish-staging, publish-production, publish-git, build-and-test] + needs: [build-and-test, publish-to-npm, publish-to-git] container: image: node:20-alpine steps: - - name: Finish task - run: echo Done - - name: Publish to Git - run: npm publish + - run: echo Done