Skip to content

Commit 174a5c4

Browse files
committed
Update GitHub Actions
1 parent 02bbac6 commit 174a5c4

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

.github/workflows/linux.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ env:
1515
jobs:
1616
build:
1717
name: "Build on x64"
18-
runs-on: ubuntu-24.04
18+
runs-on: ubuntu-latest
1919
steps:
2020
- name: "Checkout"
2121
uses: actions/checkout@v4
@@ -24,14 +24,16 @@ jobs:
2424
- name: "Setup Environment"
2525
run: |
2626
mkdir build
27-
sudo add-apt-repository universe
28-
sudo apt-get update -y
29-
sudo apt-get install firefox g++-14 gcc-14 xdg-user-dirs gettext tzdata locales -y
27+
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
28+
sudo apt-get install firefox xdg-user-dirs xdg-user-dirs-gtk gettext tzdata locales -y
29+
brew install gcc cmake
3030
xdg-user-dirs-update
31+
xdg-user-dirs-gtk-update
3132
sudo locale-gen en_US.UTF-8
3233
sudo update-locale LANG=en_US.UTF-8
33-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100
34-
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 100
34+
sudo update-alternatives --install /usr/bin/gcc gcc /home/linuxbrew/.linuxbrew/bin/gcc-14 100
35+
sudo update-alternatives --install /usr/bin/g++ g++ /home/linuxbrew/.linuxbrew/bin/g++-14 100
36+
sudo update-alternatives --install /usr/bin/cmake cmake /home/linuxbrew/.linuxbrew/bin/cmake 100
3537
- name: "Unlock Keyring"
3638
uses: t1m0thyj/unlock-keyring@v1
3739
- name: "Vcpkg"

.github/workflows/windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ env:
1515
jobs:
1616
build:
1717
name: "Build on x64"
18-
runs-on: windows-2019
18+
runs-on: windows-latest
1919
steps:
2020
- name: "Checkout"
2121
uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
3535
- name: "Build"
3636
working-directory: ${{github.workspace}}/build
3737
run: |
38-
cmake -G "Visual Studio 16 2019" .. -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install
38+
cmake -G "Visual Studio 17 2022" .. -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install
3939
cmake --build . --config Release
4040
- name: "Install"
4141
working-directory: ${{github.workspace}}/build

0 commit comments

Comments
 (0)