diff --git a/.changes/config.json b/.changes/config.json index 3e5527246..4e6e7709a 100644 --- a/.changes/config.json +++ b/.changes/config.json @@ -30,17 +30,13 @@ } }, "publish": [ - { - "command": "cargo package --no-verify", - "dryRunCommand": true - }, { "command": "echo '
\n

Cargo Publish

\n\n```'", "dryRunCommand": true, "pipe": true }, { - "command": "cargo publish", + "command": "cargo publish --no-verify", "dryRunCommand": "cargo publish --dry-run", "pipe": true }, @@ -266,28 +262,7 @@ }, "sql": { "path": "./plugins/sql", - "manager": "rust", - "publish": [ - { - "command": "cargo package --no-verify", - "dryRunCommand": true - }, - { - "command": "echo '
\n

Cargo Publish

\n\n```'", - "dryRunCommand": true, - "pipe": true - }, - { - "command": "cargo publish --features sqlite", - "dryRunCommand": "cargo publish --features sqlite --dry-run", - "pipe": true - }, - { - "command": "echo '```\n\n
\n'", - "dryRunCommand": true, - "pipe": true - } - ] + "manager": "rust" }, "sql-js": { "path": "./plugins/sql", diff --git a/.github/workflows/covector-version-or-publish-v2.yml b/.github/workflows/covector-version-or-publish-v2.yml deleted file mode 100644 index 0662c688d..000000000 --- a/.github/workflows/covector-version-or-publish-v2.yml +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 2019-2023 Tauri Programme within The Commons Conservancy -# SPDX-License-Identifier: Apache-2.0 -# SPDX-License-Identifier: MIT - -name: version or publish - -on: - push: - branches: - - v2 - -permissions: - # required for npm provenance - id-token: write - # required to create the GitHub Release - contents: write - # required for creating the Version Packages Release - pull-requests: write - -jobs: - version-or-publish: - runs-on: ubuntu-latest - timeout-minutes: 65 - outputs: - change: ${{ steps.covector.outputs.change }} - commandRan: ${{ steps.covector.outputs.commandRan }} - successfulPublish: ${{ steps.covector.outputs.successfulPublish }} - - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 # required for use of git history - - - uses: actions/setup-node@v4 - with: - node-version: "lts/*" - registry-url: "https://registry.npmjs.org" - - - uses: pnpm/action-setup@v4 - with: - version: 9.x.x - run_install: true - - - name: install webkit2gtk and libudev for [authenticator] - run: | - sudo apt-get update - sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libudev-dev - - - name: cargo login - run: cargo login ${{ secrets.ORG_CRATES_IO_TOKEN }} - - - name: git config - run: | - git config --global user.name "${{ github.event.pusher.name }}" - git config --global user.email "${{ github.event.pusher.email }}" - - - name: Setup target dir on /mnt - run: | - sudo mkdir /mnt/target - WORKSPACE_OWNER="$(stat -c '%U:%G' "${GITHUB_WORKSPACE}")" - sudo chown -R "${WORKSPACE_OWNER}" /mnt/target - - - name: covector version or publish (publish when no change files present) - uses: jbolda/covector/packages/action@covector-v0 - id: covector - env: - CARGO_TARGET_DIR: /mnt/target - NODE_AUTH_TOKEN: ${{ secrets.ORG_NPM_TOKEN }} - with: - token: ${{ secrets.GITHUB_TOKEN }} - command: "version-or-publish" - createRelease: true - recognizeContributors: true - - - name: Create Pull Request With Versions Bumped - id: cpr - uses: tauri-apps/create-pull-request@v3 - if: steps.covector.outputs.commandRan == 'version' - with: - title: "Publish New Versions (v2)" - commit-message: "publish new versions" - labels: "version updates" - branch: "ci/release-v2" - body: ${{ steps.covector.outputs.change }} diff --git a/.github/workflows/covector-version-or-publish.yml b/.github/workflows/covector-version-or-publish.yml index 1828bf2f0..c2af8a678 100644 --- a/.github/workflows/covector-version-or-publish.yml +++ b/.github/workflows/covector-version-or-publish.yml @@ -8,6 +8,7 @@ on: push: branches: - v1 + - v2 permissions: # required for npm provenance @@ -41,11 +42,6 @@ jobs: version: 9.x.x run_install: true - - name: install webkit2gtk and libudev for [authenticator] - run: | - sudo apt-get update - sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libudev-dev - - name: cargo login run: cargo login ${{ secrets.ORG_CRATES_IO_TOKEN }} @@ -54,10 +50,18 @@ jobs: git config --global user.name "${{ github.event.pusher.name }}" git config --global user.email "${{ github.event.pusher.email }}" + - name: Setup target dir on /mnt + # This directory has a larger partition size + run: | + sudo mkdir /mnt/target + WORKSPACE_OWNER="$(stat -c '%U:%G' "${GITHUB_WORKSPACE}")" + sudo chown -R "${WORKSPACE_OWNER}" /mnt/target + - name: covector version or publish (publish when no change files present) uses: jbolda/covector/packages/action@covector-v0 id: covector env: + CARGO_TARGET_DIR: /mnt/target NODE_AUTH_TOKEN: ${{ secrets.ORG_NPM_TOKEN }} with: token: ${{ secrets.GITHUB_TOKEN }} @@ -65,13 +69,17 @@ jobs: createRelease: true recognizeContributors: true + - name: Sync Cargo.lock + if: steps.covector.outputs.commandRan == 'version' + run: cargo tree --depth 0 + - name: Create Pull Request With Versions Bumped id: cpr uses: tauri-apps/create-pull-request@v3 if: steps.covector.outputs.commandRan == 'version' with: - title: "Publish New Versions" + title: "Publish New Versions (${{ github.ref_name }})" commit-message: "publish new versions" labels: "version updates" - branch: "ci/release-v1" + branch: "ci/release-${{ github.ref_name }}" body: ${{ steps.covector.outputs.change }}