Skip to content

Commit 21deb75

Browse files
bmehta001Copilot
andcommitted
Merge upstream main into nonvcpkg embedding target
Preserve the canonical CMake dependency refactor while incorporating upstream CI and runtime fixes. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
2 parents 0b7b0cf + 55aa8fa commit 21deb75

19 files changed

Lines changed: 400 additions & 150 deletions

‎.github/dependabot.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
groups:
6+
github-actions:
7+
patterns: ["*"]
8+
schedule:
9+
interval: "weekly"
10+
cooldown:
11+
default-days: 7

‎.github/workflows/build-android.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
name: Build for Android
3636
steps:
3737
- name: Checkout
38-
uses: actions/checkout@v4
38+
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
3939
with:
4040
submodules: false
4141
- name: Update submodules
@@ -44,15 +44,15 @@ jobs:
4444
git config --global submodule.lib/modules.update none
4545
git -c protocol.version=2 submodule update --init --force --depth=1
4646
- name: Setup Java
47-
uses: actions/setup-java@v5
47+
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
4848
with:
4949
distribution: 'adopt'
5050
java-version: '17'
5151
- name: Remove default github maven configuration
5252
# Workaround for: 'Unable to decrypt local Maven settings credentials'
5353
run: rm $Env:USERPROFILE\.m2\settings.xml
5454
- name: Setup Android SDK
55-
uses: android-actions/setup-android@v3
55+
uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2
5656
- name: Install NDK
5757
run: |
5858
java -version
@@ -83,7 +83,7 @@ jobs:
8383
working-directory: lib\android_build
8484
- name: Upload Reports
8585
if: failure()
86-
uses: actions/upload-artifact@v4
86+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
8787
with:
8888
name: reports
8989
path: lib\android_build\maesdk\build\reports

‎.github/workflows/build-ios-mac.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ jobs:
5454
- name: Grant write permissions to /usr/local
5555
run: |
5656
sudo chown -R $USER:staff /usr/local
57-
- uses: actions/checkout@v4
58-
- name: Initialize googletest
59-
run: git submodule update --init --depth=1 third_party/googletest
57+
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
58+
with:
59+
submodules: 'true'
6060
- name: build
6161
run: |
6262
if [[ "${{ matrix.os }}" == "macos-14" ]]; then

‎.github/workflows/build-posix-latest.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ jobs:
4343

4444
steps:
4545
- name: Checkout
46-
uses: actions/checkout@v4
47-
- name: Initialize googletest
48-
run: git submodule update --init --depth=1 third_party/googletest
46+
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
47+
with:
48+
submodules: 'true'
4949
- name: Test ${{ matrix.os }} ${{ matrix.config }}
5050
run: ./build-tests.sh ${{ matrix.config }}
5151

@@ -54,7 +54,9 @@ jobs:
5454
runs-on: ubuntu-latest
5555
steps:
5656
- name: Checkout
57-
uses: actions/checkout@v4
57+
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
58+
with:
59+
submodules: 'true'
5860
- name: Install clang
5961
run: sudo apt-get update && sudo apt-get install -y clang
6062
- name: Compile each public header standalone under strict flags

‎.github/workflows/build-ubuntu-2204.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ jobs:
4343

4444
steps:
4545
- name: Checkout
46-
uses: actions/checkout@v4
47-
- name: Initialize googletest
48-
run: git submodule update --init --depth=1 third_party/googletest
46+
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
47+
with:
48+
submodules: 'true'
4949
- name: Test ${{ matrix.os }} ${{ matrix.config }}
5050
run: ./build-tests.sh ${{ matrix.config }}

‎.github/workflows/build-windows-vs2022.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
steps:
2929

3030
- name: Checkout
31-
uses: actions/checkout@v4
31+
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
3232

3333
- name: Build
3434
env:

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ jobs:
3939

4040
steps:
4141
- name: Checkout
42-
uses: actions/checkout@v4
42+
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
4343
continue-on-error: true
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@v4
47+
uses: github/codeql-action/init@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
4848
with:
4949
languages: ${{ matrix.language }}
5050
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -75,7 +75,7 @@ jobs:
7575
# make release
7676

7777
- name: Perform CodeQL Analysis
78-
uses: github/codeql-action/analyze@v4
78+
uses: github/codeql-action/analyze@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
7979

8080
analyze-java:
8181
name: Analyze Java
@@ -90,7 +90,7 @@ jobs:
9090

9191
steps:
9292
- name: Checkout
93-
uses: actions/checkout@v4
93+
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
9494
continue-on-error: true
9595

9696
- name: Update submodules
@@ -100,19 +100,19 @@ jobs:
100100
git -c protocol.version=2 submodule update --init --force --depth=1
101101
102102
- name: Initialize CodeQL
103-
uses: github/codeql-action/init@v4
103+
uses: github/codeql-action/init@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
104104
with:
105105
languages: java
106106

107107
- name: Setup Java
108-
uses: actions/setup-java@v5
108+
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
109109
with:
110110
distribution: 'adopt'
111111
java-version: '17'
112112
- name: Remove default github maven configuration
113113
run: rm $Env:USERPROFILE\.m2\settings.xml
114114
- name: Setup Android SDK
115-
uses: android-actions/setup-android@v3
115+
uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2
116116
- name: Install NDK
117117
run: |
118118
java -version
@@ -139,4 +139,4 @@ jobs:
139139
working-directory: lib\android_build
140140

141141
- name: Perform CodeQL Analysis
142-
uses: github/codeql-action/analyze@v4
142+
uses: github/codeql-action/analyze@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6

‎.github/workflows/deploy-docs-pages.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ jobs:
3333

3434
steps:
3535
- name: Check out repository
36-
uses: actions/checkout@v4
36+
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
3737

3838
- name: Set up Python
39-
uses: actions/setup-python@v5
39+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
4040
with:
4141
python-version: "3.12"
4242

@@ -55,7 +55,7 @@ jobs:
5555

5656
- name: Upload Pages artifact
5757
if: github.event_name != 'pull_request'
58-
uses: actions/upload-pages-artifact@v3
58+
uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3.0.1
5959
with:
6060
path: docs/public/_build/html
6161

@@ -71,8 +71,8 @@ jobs:
7171

7272
steps:
7373
- name: Configure GitHub Pages
74-
uses: actions/configure-pages@v5
74+
uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5.0.0
7575

7676
- name: Deploy to GitHub Pages
7777
id: deployment
78-
uses: actions/deploy-pages@v4
78+
uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4.0.5

‎.github/workflows/spellcheck.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
steps:
2525

2626
- name: Checkout
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
2828
continue-on-error: true
2929

3030
- name: install misspell

‎.github/workflows/test-vcpkg.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: windows-latest
2727
name: Windows (x64-windows-static)
2828
steps:
29-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
3030

3131
- name: Bootstrap vcpkg
3232
run: |
@@ -42,7 +42,7 @@ jobs:
4242
runs-on: ubuntu-latest
4343
name: Linux (x64-linux)
4444
steps:
45-
- uses: actions/checkout@v4
45+
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
4646

4747
- name: Bootstrap vcpkg
4848
run: |
@@ -60,7 +60,7 @@ jobs:
6060
runs-on: macos-latest
6161
name: macOS (native)
6262
steps:
63-
- uses: actions/checkout@v4
63+
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
6464

6565
- name: Bootstrap vcpkg
6666
run: |
@@ -78,7 +78,7 @@ jobs:
7878
runs-on: macos-latest
7979
name: iOS (arm64-ios cross-compile)
8080
steps:
81-
- uses: actions/checkout@v4
81+
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
8282

8383
- name: Bootstrap vcpkg
8484
run: |
@@ -96,7 +96,7 @@ jobs:
9696
runs-on: ubuntu-latest
9797
name: Android (arm64-v8a API 23 cross-compile)
9898
steps:
99-
- uses: actions/checkout@v4
99+
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
100100

101101
- name: Bootstrap vcpkg
102102
run: |

0 commit comments

Comments
 (0)