Skip to content

Commit af5f0cb

Browse files
committed
ci: update compilers
1 parent 9fe5ec5 commit af5f0cb

File tree

6 files changed

+36
-13
lines changed

6 files changed

+36
-13
lines changed

.github/workflows/linux-test.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,18 @@ jobs:
3737
Packages/com.github.homuler.mediapipe/Runtime/Scripts/Protobuf/**/*.cs
3838
Packages/com.github.homuler.mediapipe/PackageResources/MediaPipe/*.bytes
3939
Packages/com.github.homuler.mediapipe/PackageResources/MediaPipe/*.txt
40-
key: libs-ubuntu-22.04-v1-${{ hashFiles('cache_key.txt') }}
40+
key: libs-ubuntu-22.04-v3-${{ hashFiles('cache_key.txt') }}
4141

4242
# Setup build tools
4343
- name: Mount bazel cache
4444
if: steps.cache-libs.outputs.cache-hit != 'true'
4545
uses: actions/cache/restore@v4
4646
with:
4747
path: "~/.cache/bazel"
48-
key: bazel-ubuntu-22.04-v1-${{ hashFiles('WORKSPACE') }}-${{ hashFiles('cache_key.txt') }}
48+
key: bazel-ubuntu-22.04-v3-${{ hashFiles('WORKSPACE') }}-${{ hashFiles('cache_key.txt') }}
4949
restore-keys: |
50-
bazel-ubuntu-22.04-v1-${{ hashFiles('WORKSPACE') }}-
51-
bazel-ubuntu-22.04-v1-
50+
bazel-ubuntu-22.04-v3-${{ hashFiles('WORKSPACE') }}-
51+
bazel-ubuntu-22.04-v3-
5252
5353
- name: Remove cache_key.txt
5454
run: |
@@ -63,11 +63,11 @@ jobs:
6363
- name: Install dependencies
6464
if: steps.cache-libs.outputs.cache-hit != 'true'
6565
run: |
66-
# install GCC/G++ 11
66+
# install GCC/G++ 15
6767
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
6868
sudo apt-get update
69-
sudo apt-get install -y --no-install-recommends gcc-11 g++-11
70-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 --slave /usr/bin/g++ g++ /usr/bin/g++-11
69+
sudo apt-get install -y --no-install-recommends gcc-15 g++-15
70+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-15 100 --slave /usr/bin/g++ g++ /usr/bin/g++-15
7171
7272
# install Clang 16
7373
wget https://apt.llvm.org/llvm.sh
@@ -106,7 +106,7 @@ jobs:
106106
uses: actions/cache/save@v4
107107
with:
108108
path: ~/.cache/bazel
109-
key: bazel-ubuntu-22.04-v1-${{ hashFiles('WORKSPACE') }}-${{ hashFiles('cache_key.txt') }}
109+
key: bazel-ubuntu-22.04-v3-${{ hashFiles('WORKSPACE') }}-${{ hashFiles('cache_key.txt') }}
110110

111111
test:
112112
runs-on: ${{ matrix.os }}

.github/workflows/macos-test.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,20 @@ jobs:
2222
with:
2323
ref: ${{ inputs.ref }}
2424

25+
- name: Install Clang 16
26+
run: |
27+
brew install llvm
28+
echo 'export PATH="/usr/local/opt/llvm/bin:$PATH"' >> /Users/runner/.bash_profile
29+
echo 'export LDFLAGS="-L/usr/local/opt/llvm/lib"' >> /Users/runner/.bash_profile
30+
echo 'export CPPFLAGS="-I/usr/local/opt/llvm/include"' >> /Users/runner/.bash_profile
31+
32+
- name: Check Clang
33+
run: |
34+
sudo rm -rf /Library/Developer/CommandLineTools
35+
xcode-select --install
36+
where clang
37+
clang --version
38+
2539
# Cache built libraries
2640
- name: Concat native library source files
2741
run: |

.github/workflows/package.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,15 @@ jobs:
113113
with:
114114
ref: ${{ inputs.ref }}
115115

116+
- name: Install Clang 16
117+
run: |
118+
brew install llvm
119+
echo 'export PATH="/usr/local/opt/llvm/bin:$PATH"' >> /Users/runner/.bash_profile
120+
echo 'export LDFLAGS="-L/usr/local/opt/llvm/lib"' >> /Users/runner/.bash_profile
121+
echo 'export CPPFLAGS="-I/usr/local/opt/llvm/include"' >> /Users/runner/.bash_profile
122+
123+
clang --version
124+
116125
# Setup Python
117126
- uses: actions/setup-python@v5
118127
with:

.github/workflows/windows-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
required: true
1414
jobs:
1515
build:
16-
runs-on: windows-2019
16+
runs-on: windows-2022
1717
steps:
1818
- uses: actions/checkout@v4
1919
with:

docker/linux/x86_64/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ RUN curl -O https://ftp.gnu.org/gnu/binutils/binutils-2.36.tar.gz && \
4040
make && \
4141
make install
4242

43-
# Install gcc-11
43+
# Install gcc-15
4444
RUN add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
4545
apt-get update && \
46-
apt-get install -y --no-install-recommends gcc-11 g++-11 && \
47-
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 --slave /usr/bin/g++ g++ /usr/bin/g++-11
46+
apt-get install -y --no-install-recommends gcc-15 g++-15 && \
47+
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-15 100 --slave /usr/bin/g++ g++ /usr/bin/g++-15
4848

4949
# Install Clang 16
5050
RUN curl https://apt.llvm.org/llvm.sh -o llvm.sh && \

third_party/opencv.BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ cmake(
183183
cache_entries = CACHE_ENTRIES,
184184
generate_args = select({
185185
"@bazel_tools//src/conditions:windows": [
186-
"-G \"Visual Studio 16 2019\"",
186+
"-G \"Visual Studio 17 2022\"",
187187
"-A x64",
188188
],
189189
"//conditions:default": [],

0 commit comments

Comments
 (0)