diff --git a/.changeset/six-peas-stare.md b/.changeset/six-peas-stare.md new file mode 100644 index 0000000..a6122f2 --- /dev/null +++ b/.changeset/six-peas-stare.md @@ -0,0 +1,5 @@ +--- +"@macpaw/macpaw-ui": patch +--- + +Patch changes to trigger release diff --git a/.github/actions/github-config/action.yml b/.github/actions/github-config/action.yml index f5cce46..1b23038 100644 --- a/.github/actions/github-config/action.yml +++ b/.github/actions/github-config/action.yml @@ -4,6 +4,10 @@ inputs: gpg-key-base64: description: 'Base64 GPG key' required: true + gpg-key-signing: + description: 'Git signing key' + required: true + runs: using: "composite" steps: @@ -12,9 +16,9 @@ runs: echo ${{ inputs.gpg-key-base64 }} | base64 -d > ${GITHUB_WORKSPACE}/.gpg/private.key gpg --import ${GITHUB_WORKSPACE}/.gpg/private.key - git config --global user.signingkey + git config --global user.signingkey ${{ inputs.gpg-key-signing }} git config --global commit.gpgsign true git config user.name ci-macpaw git config user.email admin+ci-gh@macpaw.com shell: bash - name: Update git config + name: Update git config \ No newline at end of file diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml index 133fc41..c50fe43 100644 --- a/.github/actions/release/action.yml +++ b/.github/actions/release/action.yml @@ -29,9 +29,7 @@ inputs: description: 'The command to use to release' required: false default: 'release' - gpg-key-base64: - description: 'The base64 encoded GPG key to use' - required: true + outputs: release-ready: description: "Random number" @@ -39,11 +37,6 @@ outputs: runs: using: composite steps: - - name: Configure git user - uses: ./.github/actions/github-config - with: - gpg-key-base64: ${{ inputs.gpg-key-base64 }} - - name: Prepare node uses: ./.github/actions/prepare-node id: prepare-node diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a2de51b..8d07934 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,6 +18,12 @@ jobs: - name: Checkout uses: actions/checkout@v3 + + - name: Configure git user + uses: ./.github/actions/github-config + with: + gpg-key-base64: ${{ secrets.CI_GITHUB_GPG_KEY_BASE64 }} + gpg-key-signing: ${{ secrets.CI_GITHUB_GPG_KEY_SIGNING }} - name: Make a release if needed uses: ./.github/actions/release @@ -28,8 +34,7 @@ jobs: release-commit-message: 'chore(release): version update for packages' github-token: ${{ secrets.GITHUB_TOKEN }} release-command: 'changes:release' - gpg-key-base64: ${{ secrets.CI_GITHUB_GPG_KEY_BASE64 }} - + - name: Generate outputs id: releaseOutputs if: steps.release.outputs.release-ready == 'true' @@ -51,7 +56,7 @@ jobs: - name: Prepare uses: ./.github/actions/prepare-packages with: - node-version: 18 + node-version: 16 build-command: 'lib' publish-npm: diff --git a/package-lock.json b/package-lock.json index 213e01e..ab12b70 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@macpaw/macpaw-ui", - "version": "4.16.0", + "version": "4.16.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@macpaw/macpaw-ui", - "version": "4.16.0", + "version": "4.16.1", "license": "MIT", "dependencies": { "@floating-ui/react": "^0.24.1",