diff --git a/.github/workflows/_init.yml b/.github/workflows/_init.yml index 13649bb..a327e67 100644 --- a/.github/workflows/_init.yml +++ b/.github/workflows/_init.yml @@ -2,7 +2,6 @@ name: Initialize build on: workflow_call: - outputs: NODE_VERSION: value: ${{ jobs.init.outputs.NODE_VERSION }} diff --git a/.github/workflows/_release.yml b/.github/workflows/_release.yml index d86e245..38b6cf9 100644 --- a/.github/workflows/_release.yml +++ b/.github/workflows/_release.yml @@ -10,12 +10,6 @@ on: type: string required: true - secrets: - SEMANTIC_RELEASE_NPM_TOKEN: - required: true - SEMANTIC_RELEASE_GH_TOKEN: - required: true - jobs: test: name: Release package @@ -42,5 +36,5 @@ jobs: - name: Run release run: npm run release env: - NPM_TOKEN: ${{ secrets.SEMANTIC_RELEASE_NPM_TOKEN }} - GH_TOKEN: ${{ secrets.SEMANTIC_RELEASE_GH_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NPM_TOKEN: ${{ secrets.NPM_PUBLISHER_TOKEN }} diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 251d40a..0e17de7 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -1,10 +1,8 @@ name: Development on: - push: - branches: [ '*', '*/*', '**', '!master', '!main' ] pull_request: - branches: [ master, main ] + branches: [master, main] jobs: init: @@ -14,7 +12,7 @@ jobs: test: name: Test uses: ./.github/workflows/_test.yml - needs: [ init ] + needs: [init] with: NODE_VERSION: ${{ needs.init.outputs.NODE_VERSION }} NODE_CACHE_KEY: ${{ needs.init.outputs.NODE_CACHE_KEY }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 26d2eb8..a9050bd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Release on: push: - branches: [ master, main ] + branches: [master, main] jobs: init: @@ -12,7 +12,7 @@ jobs: test: name: Test uses: ./.github/workflows/_test.yml - needs: [ init ] + needs: [init] with: NODE_VERSION: ${{ needs.init.outputs.NODE_VERSION }} NODE_CACHE_KEY: ${{ needs.init.outputs.NODE_CACHE_KEY }} @@ -20,10 +20,8 @@ jobs: release: name: Release uses: ./.github/workflows/_release.yml - needs: [ init, test ] + needs: [init, test] with: NODE_VERSION: ${{ needs.init.outputs.NODE_VERSION }} NODE_CACHE_KEY: ${{ needs.init.outputs.NODE_CACHE_KEY }} - secrets: - SEMANTIC_RELEASE_NPM_TOKEN: ${{ secrets.SEMANTIC_RELEASE_NPM_TOKEN }} - SEMANTIC_RELEASE_GH_TOKEN: ${{ secrets.SEMANTIC_RELEASE_GH_TOKEN }} + secrets: inherit