Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/release-tag.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"message": "xpro version 1.0.0 tag",
"tag": "xpv1.0.0"
"message": "xpro version 1.0.1 tag",
"tag": "xpv1.0.1"
}
6 changes: 3 additions & 3 deletions .github/workflows/xpbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ jobs:
contents: read
pull-requests: write
packages: write
uses: externpro/externpro/.github/workflows/build-linux.yml@26.01
uses: externpro/externpro/.github/workflows/build-linux.yml@26.01.4
secrets:
automation_token: ${{ secrets.GHCR_TOKEN }}
with:
cmake_workflow_preset_suffix: Release
macos:
uses: externpro/externpro/.github/workflows/build-macos.yml@26.01
uses: externpro/externpro/.github/workflows/build-macos.yml@26.01.4
secrets: inherit
with:
cmake_workflow_preset_suffix: Release
windows:
uses: externpro/externpro/.github/workflows/build-windows.yml@26.01
uses: externpro/externpro/.github/workflows/build-windows.yml@26.01.4
secrets: inherit
with:
cmake_workflow_preset_suffix: Release
12 changes: 0 additions & 12 deletions .github/workflows/xpinit.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/xprelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
# Upload build artifacts as release assets
release-from-build:
if: github.event_name == 'workflow_dispatch'
uses: externpro/externpro/.github/workflows/release-from-build.yml@26.01
uses: externpro/externpro/.github/workflows/release-from-build.yml@26.01.4
with:
workflow_run_url: ${{ github.event.inputs.workflow_run_url }}
permissions:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/xptag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
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@26.01
uses: externpro/externpro/.github/workflows/tag-release.yml@26.01.4
with:
merge_sha: ${{ github.event.pull_request.merge_commit_sha }}
pr_number: ${{ github.event.pull_request.number }}
Expand Down
4 changes: 1 addition & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 4.3)
project(OpenGL)
string(JOIN "\n" EXT2
"find_package(OpenGL REQUIRED BYPASS_PROVIDER)"
"list(APPEND reqVars OpenGL_FOUND)"
""
)
string(JOIN "\n" COND_OPEN
Expand All @@ -11,9 +12,6 @@ string(JOIN "\n" COND_OPEN
string(JOIN "\n" COND_CLOSE
""
" set(__xp_opengl_found_message_shown TRUE CACHE INTERNAL \"Flag to track if OpenGL found message was shown\")"
"else()"
" # Skip the message but still set OpenGL_FOUND"
" set(OpenGL_FOUND TRUE)"
"endif()"
)
xpExternPackage(BASE v0 XPDIFF "bin"
Expand Down