From 0caff7f761a16e703f0aff08592889176b96a459 Mon Sep 17 00:00:00 2001 From: Alejandro Santisteban <72552837+alesancor1@users.noreply.github.com> Date: Fri, 24 Sep 2021 15:43:05 +0200 Subject: [PATCH] fix: Checking out main branch before npm release --- .github/workflows/nodejs.yaml | 17 +++++++++- .github/workflows/release.yaml | 20 ------------ CHANGELOG.md | 59 ---------------------------------- package.json | 2 +- 4 files changed, 17 insertions(+), 81 deletions(-) delete mode 100644 .github/workflows/release.yaml delete mode 100644 CHANGELOG.md diff --git a/.github/workflows/nodejs.yaml b/.github/workflows/nodejs.yaml index d18456f..53b7804 100644 --- a/.github/workflows/nodejs.yaml +++ b/.github/workflows/nodejs.yaml @@ -94,4 +94,19 @@ jobs: pr_assignee: "alesancor1" pr_label: "auto-pr" github_token: ${{ secrets.GITHUB_TOKEN }} - + npmReleaseMain: + name: (Main) Publish new release to npm registry + needs: githubRelease + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + ref: 'main' + - uses: actions/setup-node@v2 + with: + node-version: '14.x' + registry-url: 'https://registry.npmjs.org' + - run: npm install + - run: npm publish + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml deleted file mode 100644 index e54708d..0000000 --- a/.github/workflows/release.yaml +++ /dev/null @@ -1,20 +0,0 @@ -name: Release CI - -on: - release: - types: [published] - -jobs: - npmReleaseMain: - name: (Main) Publish new release to npm registry - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - with: - node-version: '14.x' - registry-url: 'https://registry.npmjs.org' - - run: npm install - - run: npm publish - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 179b575..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,59 +0,0 @@ -## [1.17.2](https://github.com/governify/commons/compare/v1.17.1...v1.17.2) (2021-09-24) - - -### Bug Fixes - -* Moved npm release CI to separate workflow ([dea2f99](https://github.com/governify/commons/commit/dea2f99406ea29be9d938812b048cb5e7d25b2c2)) -* Sync versions ([0751438](https://github.com/governify/commons/commit/075143874894916074360396b2f823d720a7a5ca)) - - - -## [1.17.1](https://github.com/governify/commons/compare/df906c436502e91f87878ab7f13fc5447a2331d2...v1.17.1) (2021-09-24) - - -### Bug Fixes - -* Added commit message when releasing ([6aaefc8](https://github.com/governify/commons/commit/6aaefc861412f4738507d204d1cedb97dc6ebadc)) -* Automatically increment npm version in CI ([907adfc](https://github.com/governify/commons/commit/907adfcc658e130499fa2be78311cdb6feb97902)) -* ci indentation ([540ceed](https://github.com/governify/commons/commit/540ceedf2b5f0e8ca16b45760cf2d491271a6056)) -* Creating commons.log when not found ([a237e0e](https://github.com/governify/commons/commit/a237e0ebc0907ae817a22a6cce17c68fe862098b)) -* f cesar ([74264bf](https://github.com/governify/commons/commit/74264bf4c10de09468a2f279f4a77f548b651083)) -* fixed CI ([e3e3370](https://github.com/governify/commons/commit/e3e33706e56023b1eddbd374995e93a43397db29)) -* Fixed CI to publish to npm ([9260ac5](https://github.com/governify/commons/commit/9260ac5f94f02aea22f3368b69ebf9f388d0f58b)) -* Fixed period when hour is 24 ([de6ec69](https://github.com/governify/commons/commit/de6ec6909132f02b9ae296ca400852281c332dee)) -* RequestLogging fixed ([99f6f2c](https://github.com/governify/commons/commit/99f6f2c3633768d1426ef0b8e74d1bc051355663)) -* Retries number ([6875406](https://github.com/governify/commons/commit/687540646c0451c136bb5c1c996904f4862b3a32)) -* Set git config for npm version commit ([da71b44](https://github.com/governify/commons/commit/da71b44999a843fa5ff066b0adc1e39bae70013c)) -* sync npm and github release version ([e4f9502](https://github.com/governify/commons/commit/e4f9502358f3666eb33dae8937721a92db39ac1d)) -* sync npm and github release version ([e09a122](https://github.com/governify/commons/commit/e09a122bdb94309a120252f6e5b824bf449f01c1)) -* sync package-lock ([fe860f5](https://github.com/governify/commons/commit/fe860f571219a159f1e03beee51a33d554bc0b96)) -* Trace id ([1cb2c13](https://github.com/governify/commons/commit/1cb2c139077d0205a02141948945d2e00b974f4f)) -* Typo in readme ([a1e40b1](https://github.com/governify/commons/commit/a1e40b1f05c85ac4835815e17886ad009777be96)) -* updated CI ([31a046c](https://github.com/governify/commons/commit/31a046c04bfd980cd43960503f5f222784b8553a)) - - -### Features - -* Added CI for automatic release and publish ([116d934](https://github.com/governify/commons/commit/116d93498456ed76ccca499c0e03a96b74487892)) -* added logger endpoint ([4d47ae7](https://github.com/governify/commons/commit/4d47ae731eea3b49ad2b6fd57e7b286c4c5762a3)) -* Adding default debug for requests ([467660a](https://github.com/governify/commons/commit/467660a8f41e789782d16c166d20dfd67fb8cc82)) -* Adding infrastructure endpoint ([54805ce](https://github.com/governify/commons/commit/54805cebcd50f41f6b08b00db4c144cadd37072a)) -* Adding request logging ([476b510](https://github.com/governify/commons/commit/476b5109b3d10b496e6d59f3ffaff15b623972a1)) -* File logget ([d83d17b](https://github.com/governify/commons/commit/d83d17bc0b5e34c33701f981e252a570291a4016)) -* Implementing retries in init and some utils ([3f72116](https://github.com/governify/commons/commit/3f721161fe2ebd874d916234f6a381dfe1e99811)) -* Implementing the new commons middleware ([1e996da](https://github.com/governify/commons/commit/1e996da5749676ee9e031064bdf0dc0bc45b0da7)) -* Initial version of Governify Commons ([df906c4](https://github.com/governify/commons/commit/df906c436502e91f87878ab7f13fc5447a2331d2)) -* is ready var and export ([177cce2](https://github.com/governify/commons/commit/177cce26087c0faf333c8976642f6b2d4c44e59b)) -* New logs implementation ([df90ed4](https://github.com/governify/commons/commit/df90ed470b79d1c8ae7ac044bfa5e64d4d448f3f)) -* npm badge ([84df907](https://github.com/governify/commons/commit/84df907737706230c1ab3688246afe390d336bcf)) -* npm publish 1.16.1 ([dbc8c17](https://github.com/governify/commons/commit/dbc8c17a98430ba6cc6316c7f33a3bcc5a10b7fe)) -* packagelock and gitignore ([bb479c2](https://github.com/governify/commons/commit/bb479c2cff745f4a1eb835a2a10a4d5b3b00a791)) -* refactor period calculation ([c5f6828](https://github.com/governify/commons/commit/c5f682881600fbbfc64c2d5addb37a6e93a1bf05)) -* refactor period calculation ([239d737](https://github.com/governify/commons/commit/239d737c8169ed6b76469036ed2f0e11fc07ec48)) -* refactor period calculation ([8f9c901](https://github.com/governify/commons/commit/8f9c901435e4438a6a3a3f21433fe86960cdffd2)) -* refactor period calculation ([0af5f8d](https://github.com/governify/commons/commit/0af5f8d4a0b7f1f8ab3327fffa9cf64ed1240010)) -* Tags updated ([e6e6b95](https://github.com/governify/commons/commit/e6e6b957d4ec7c86da42b09673533dd04b5c0c6a)) -* update npm version ([ebf60fb](https://github.com/governify/commons/commit/ebf60fb3f6869b7b9e79e1bb24cea4289831fd64)) - - - diff --git a/package.json b/package.json index 204dbb1..e805f71 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "governify-commons", - "version": "1.17.2", + "version": "1.17.1", "description": "Governify Commons used for Governify microservices", "main": "index.js", "scripts": {