diff --git a/.devcontainer b/.devcontainer index 7f4db12bf1..8a5e4df722 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 7f4db12bf1f0e1cc1fd325aa448ac2fb786acf96 +Subproject commit 8a5e4df7220b4870ba0ff81ee9e2b319b2855977 diff --git a/.github/release-tag.yml b/.github/release-tag.yml new file mode 100644 index 0000000000..c4c8bbac54 --- /dev/null +++ b/.github/release-tag.yml @@ -0,0 +1,2 @@ +tag: xpv5.2.3.3 +message: "xpro version 5.2.3.3 tag" diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index 5811f8dec1..76b2701dea 100644 --- a/.github/workflows/xpbuild.yml +++ b/.github/workflows/xpbuild.yml @@ -1,12 +1,12 @@ -name: Build +name: xpBuild permissions: contents: read pull-requests: write on: push: - branches: [ "dev" ] + tags: ["xpv*"] pull_request: - branches: [ "dev" ] + branches: ["xpro"] workflow_dispatch: jobs: linux: @@ -14,11 +14,11 @@ jobs: contents: read pull-requests: write packages: write - uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.3 + uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.6 secrets: inherit macos: - uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.3 + uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.6 secrets: inherit windows: - uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.3 + uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.6 secrets: inherit diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml index 86b6f88b58..a2eb28224c 100644 --- a/.github/workflows/xprelease.yml +++ b/.github/workflows/xprelease.yml @@ -1,4 +1,4 @@ -name: Release +name: xpRelease on: workflow_dispatch: inputs: @@ -6,10 +6,35 @@ on: description: 'URL of the workflow run containing artifacts to upload (e.g., https://github.com/owner/repo/actions/runs/123456789)' required: true type: string + workflow_run: + workflows: ["xpBuild"] + types: [completed] jobs: + dispatch-at-tag: + if: >- + github.event_name == 'workflow_run' && + github.event.workflow_run.conclusion == 'success' && + startsWith(github.event.workflow_run.head_branch, 'xpv') + runs-on: ubuntu-latest + permissions: + actions: write + steps: + - + name: Dispatch xpRelease at tag + shell: bash + env: + GH_TOKEN: ${{ github.token }} + RUN_URL: ${{ github.event.workflow_run.html_url }} + TAG_REF: ${{ github.event.workflow_run.head_branch }} + run: | + set -euo pipefail + gh api -X POST "repos/${{ github.repository }}/actions/workflows/xprelease.yml/dispatches" \ + -f ref="$TAG_REF" \ + -f inputs[workflow_run_url]="$RUN_URL" # Upload build artifacts as release assets release-from-build: - uses: externpro/externpro/.github/workflows/release-from-build.yml@25.07.3 + if: github.event_name == 'workflow_dispatch' + uses: externpro/externpro/.github/workflows/release-from-build.yml@25.07.6 with: workflow_run_url: ${{ github.event.inputs.workflow_run_url }} permissions: diff --git a/.github/workflows/xptag.yml b/.github/workflows/xptag.yml new file mode 100644 index 0000000000..b5ce9503a2 --- /dev/null +++ b/.github/workflows/xptag.yml @@ -0,0 +1,16 @@ +name: xpTag +permissions: + contents: write + issues: write +on: + pull_request: + types: [closed] +jobs: + tag: + if: ${{ github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'xpro' && contains(github.event.pull_request.labels.*.name, 'release:tag') }} + uses: externpro/externpro/.github/workflows/tag-release.yml@25.07.6 + with: + merge_sha: ${{ github.event.pull_request.merge_commit_sha }} + pr_number: ${{ github.event.pull_request.number }} + secrets: + workflow_write_token: ${{ secrets.XPUPDATE_TOKEN }}