Skip to content

Commit 269e5fb

Browse files
imbobzimbobz
committed
Merge pull request #68 from bobis33/Refactor/scripts-usage
`Refactor: script usage`
2 parents 30a5ac5 + 22d70a1 commit 269e5fb

13 files changed

Lines changed: 59 additions & 49 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ jobs:
3030
build_test: scripts/unix/build.sh release --tests
3131
binary_test: cmake-build-release/bin/cae-tests
3232
deps: |
33-
./scripts/unix/install-cmake.sh
34-
sudo apt update && sudo apt install -y cmake xorg-dev libegl1-mesa-dev
33+
./scripts/unix/linux/install-cmake.sh
34+
sudo apt update && sudo apt install -y xorg-dev libegl1-mesa-dev
3535
3636
- os: macos-15
3737
shell: bash
3838
build: scripts/unix/build.sh release
3939
binary: cmake-build-release/bin/cae
4040
build_test: scripts/unix/build.sh release --tests
4141
binary_test: cmake-build-release/bin/cae-tests
42-
deps: brew upgrade cmake
42+
deps: echo ""
4343

4444
- os: windows-2025
4545
shell: powershell

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ jobs:
4040
if: matrix.language == 'cpp'
4141
shell: bash
4242
run: |
43-
./scripts/unix/install-cmake.sh
44-
sudo apt update && sudo apt install -y cmake xorg-dev libegl1-mesa-dev
43+
./scripts/unix/linux/install-cmake.sh
44+
sudo apt update && sudo apt install -y xorg-dev libegl1-mesa-dev
4545
./scripts/unix/build.sh release
4646
4747
- name: Perform CodeQL Analysis

‎.github/workflows/deploy-doxygen.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ jobs:
2323

2424
- name: 'Install dependencies'
2525
run: |
26-
./scripts/unix/ubuntu/install-dependencies.sh doc
27-
./scripts/unix/install-cmake.sh
28-
sudo apt update && sudo apt install -y cmake libxkbcommon-dev xorg-dev libwayland-dev libudev-dev
26+
sudo apt update && sudo apt install -y libgl1-mesa-dev qt6-base-dev texlive-latex-base texlive-latex-recommended texlive-latex-extra graphviz texlive-xetex libxkbcommon-dev xorg-dev libwayland-dev libudev-dev
27+
./scripts/unix/linux/install-doxygen.sh
28+
./scripts/unix/linux/install-cmake.sh
29+
sudo apt update
2930
3031
- name: 'Generate documentation'
3132
run: ./scripts/unix/build.sh release --doc

‎.github/workflows/gitleaks.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
scan:
1818
name: ''
1919
if: github.actor != 'dependabot[bot]'
20-
runs-on: ubuntu-latest
20+
runs-on: ubuntu-24.04
2121
defaults:
2222
run:
2323
shell: bash
@@ -32,10 +32,11 @@ jobs:
3232

3333
- name: Install Gitleaks
3434
env:
35-
VERSION: 8.28.0
35+
VERSION: 8.30.0
36+
PLATFORM: linux
3637
run: |
37-
wget https://github.com/gitleaks/gitleaks/releases/download/v${VERSION}/gitleaks_${VERSION}_linux_x64.tar.gz
38-
tar -xf gitleaks_${VERSION}_linux_x64.tar.gz
38+
wget https://github.com/gitleaks/gitleaks/releases/download/v${VERSION}/gitleaks_${VERSION}_${PLATFORM}_x64.tar.gz
39+
tar -xf gitleaks_${VERSION}_${PLATFORM}_x64.tar.gz
3940
sudo mv gitleaks /usr/local/bin/
4041
4142
- name: Run Gitleaks

‎cmake/modules/CopyAssets.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ function(copy_directory_to_target TARGET SRC_DIR DST_SUBDIR)
33
message(FATAL_ERROR "Target '${TARGET}' does not exist")
44
endif()
55

6-
set(COPY_TARGET_NAME copy_${TARGET}_${DST_SUBDIR})
6+
set(COPY_TARGET_NAME ${TARGET}-copy-assets)
77

88
set(DST_DIR "$<TARGET_FILE_DIR:${TARGET}>/${DST_SUBDIR}")
99

‎plugins/Renderer/OpenGL/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
project(cae-renderer-opengl
22
DESCRIPTION "CAE OpenGL Renderer Plugin"
3-
LANGUAGES CXX
3+
LANGUAGES C CXX
44
)
55

66
find_package(OpenGL REQUIRED)

scripts/unix/install-cmake.sh renamed to scripts/unix/linux/install-cmake.sh

File renamed without changes.

‎scripts/unix/linux/install-doxygen.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
set -e
3+
4+
version=1.11.0
5+
platform=linux
6+
7+
wget https://www.doxygen.nl/files/doxygen-$version.$platform.bin.tar.gz && tar xf doxygen-$version.$platform.bin.tar.gz
8+
tar xf doxygen-$version.$platform.bin.tar.gz
9+
sudo cp doxygen-$version/bin/doxygen /usr/local/bin/

‎scripts/unix/linux/install-gitleaks.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
set -e
3+
4+
version=8.30.0
5+
platform=linux
6+
7+
wget https://github.com/gitleaks/gitleaks/releases/download/v$version/gitleaks_$version_$platform_x64.tar.gz
8+
tar -xf gitleaks_$version_$platform_x64.tar.gz
9+
sudo mv gitleaks /usr/local/bin/

‎scripts/unix/linux/install-vulkansdk.sh‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
set -e
3+
4+
version=1.4.328.1
5+
platform=linux
6+
7+
wget https://sdk.lunarg.com/sdk/download/$version/$platform/vulkansdk-$platform-x86_64-$version.tar.xz
8+
tar xf vulkansdk-$platform-x86_64-$version.bin.tar.gz
9+
mkdir -p $HOME/VulkanSDK/$version
10+
mv VulkanSDK/$version/* $HOME/VulkanSDK/$version
11+
rm -rf VulkanSDK $filename
12+
13+
echo "export VULKAN_SDK=$install_dir"
14+
echo "export PATH=\$VULKAN_SDK/bin:\$PATH"
15+
echo "export LD_LIBRARY_PATH=\$VULKAN_SDK/lib:\$LD_LIBRARY_PATH"
16+
echo "export VK_ICD_FILENAMES=\$VULKAN_SDK/etc/vulkan/icd.d"
17+
echo "export VK_LAYER_PATH=\$VULKAN_SDK/etc/vulkan/explicit_layer.d"
18+
echo "Add the above lines to your ~/.bashrc or ~/.zshrc"

0 commit comments

Comments
 (0)