Skip to content

Commit

Permalink
Update nightly-release.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
@korejan
korejan committed Nov 16, 2024
1 parent 407a1a5 commit 927be59
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/nightly-release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,11 @@ jobs:
sudo apt install git wget gcc-10 g++-10 ninja-build libxxf86vm-dev libxcb-glx0-dev libcjson-dev glslang-dev glslang-tools -y
# ubuntu-focal cmake package is too old...
CMAKE_FILE=cmake-3.30.5-linux-x86_64.sh
wget https://github.com/Kitware/CMake/releases/download/v3.30.5/${CMAKE_FILE}
CMAKE_FILE=cmake-3.31.0-linux-x86_64.sh
wget https://github.com/Kitware/CMake/releases/download/v3.31.0/${CMAKE_FILE}
chmod +x ${CMAKE_FILE}
./${CMAKE_FILE} --skip-license --include-subdir
export PATH=${PWD}/cmake-3.30.5-linux-x86_64:$PATH
export PATH=${PWD}/cmake-3.31.0-linux-x86_64:$PATH
# ubuntu-focal glslang package is too old...
wget https://github.com/KhronosGroup/glslang/releases/download/master-tot/glslang-master-linux-Release.zip
Expand Down Expand Up @@ -253,11 +253,11 @@ jobs:
sudo apt install git wget gcc-10 g++-10 ninja-build libxxf86vm-dev libxcb-glx0-dev libcjson-dev glslang-dev glslang-tools -y
# ubuntu-focal cmake package is too old...
CMAKE_FILE=cmake-3.30.5-linux-x86_64.sh
wget https://github.com/Kitware/CMake/releases/download/v3.30.5/${CMAKE_FILE}
CMAKE_FILE=cmake-3.31.0-linux-x86_64.sh
wget https://github.com/Kitware/CMake/releases/download/v3.31.0/${CMAKE_FILE}
chmod +x ${CMAKE_FILE}
./${CMAKE_FILE} --skip-license --include-subdir
export PATH=${PWD}/cmake-3.30.5-linux-x86_64:$PATH
export PATH=${PWD}/cmake-3.31.0-linux-x86_64:$PATH
# ubuntu-focal glslang package is too old...
wget https://github.com/KhronosGroup/glslang/releases/download/master-tot/glslang-master-linux-Release.zip
Expand Down Expand Up @@ -420,7 +420,7 @@ jobs:
RUST_BACKTRACE: 1
ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/27.2.12479018
ANDROID_NDK_HOME: /usr/local/lib/android/sdk/ndk/27.2.12479018
ANDROID_CMAKE_BIN: /usr/local/lib/android/sdk/cmake/3.30.5/bin
ANDROID_CMAKE_BIN: /usr/local/lib/android/sdk/cmake/3.31.0/bin
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand All @@ -440,7 +440,7 @@ jobs:
sudo apt update && sudo apt upgrade -y
sudo apt install gcc-multilib
SDK_MANAGER=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager
yes | sudo $SDK_MANAGER --install "ndk;27.2.12479018" "platforms;android-29" "cmake;3.30.5"
yes | sudo $SDK_MANAGER --install "ndk;27.2.12479018" "platforms;android-29" "cmake;3.31.0"
rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android i686-linux-android
cargo install cargo-apk --git https://github.com/korejan/cargo-apk.git --branch android-manifest-entries
Expand Down Expand Up @@ -493,7 +493,7 @@ jobs:
RUST_BACKTRACE: 1
ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/27.2.12479018
ANDROID_NDK_HOME: /usr/local/lib/android/sdk/ndk/27.2.12479018
ANDROID_CMAKE_BIN: /usr/local/lib/android/sdk/cmake/3.30.5/bin
ANDROID_CMAKE_BIN: /usr/local/lib/android/sdk/cmake/3.31.0/bin
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand All @@ -514,7 +514,7 @@ jobs:
sudo apt update && sudo apt upgrade -y
sudo apt install gcc-multilib
SDK_MANAGER=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager
yes | sudo $SDK_MANAGER --install "ndk;27.2.12479018" "platforms;android-29" "cmake;3.30.5"
yes | sudo $SDK_MANAGER --install "ndk;27.2.12479018" "platforms;android-29" "cmake;3.31.0"
rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android i686-linux-android
cargo install cargo-apk --git https://github.com/korejan/cargo-apk.git --branch android-manifest-entries
Expand Down

0 comments on commit 927be59

Please sign in to comment.