Skip to content

Commit

Permalink
Update CI scripts.
Browse files Browse the repository at this point in the history
  • Loading branch information
VolkerEnderlein committed Dec 14, 2023
1 parent 1d16d8b commit 09ce444
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Checkout submodules
run: git submodule update --init --recursive
uses: actions/checkout@v4
with:
submodules: recursive

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
12 changes: 8 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,16 +127,20 @@ environment:

install:
- sh: |
if [ "$COMPILER_ID" = "clang" ]
then
brew install jpeg giflib libtiff libogg libvorbis libsndfile zlib
else
sudo apt-get -y update
sudo apt-get -y install libpng-dev libjpeg-dev libgif-dev libtiff-dev libogg-dev libvorbis-dev libsndfile-dev zlib1g-dev
fi
cd $APPVEYOR_BUILD_FOLDER
if [ "$COMPILER_ID" != "clang" ]; then sudo apt-get -y update; fi
if [ "$COMPILER_ID" != "clang" ]; then sudo apt-get -y install gcc-multilib g++-multilib libpng-dev libjpeg-dev libgif-dev libtiff-dev libogg-dev libvorbis-dev libsndfile-dev zlib1g-dev; fi
if [ "$COMPILER_ID" = "clang" ]; then brew install jpeg giflib libtiff libogg libvorbis libsndfile zlib; fi
- cmd: |
cd %APPVEYOR_BUILD_FOLDER%
set PATH=%APPVEYOR_BUILD_FOLDER%\downloads\doxygen-1.8.14;%PATH%
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" set PATH=C:\msys64\%COMPILER_ID%\bin;C:\msys64\usr\bin\;%PATH%
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" pacman --noconfirm -Syu
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" pacman --noconfirm -S mingw-w64-%CMAKE_PLATFORM%-zlib mingw-w64-%CMAKE_PLATFORM%-giflib mingw-w64-%CMAKE_PLATFORM%-libjpeg-turbo mingw-w64-%CMAKE_PLATFORM%-jasper mingw-w64-%CMAKE_PLATFORM%-libtiff mingw-w64-%CMAKE_PLATFORM%-libogg mingw-w64-%CMAKE_PLATFORM%-libvorbis mingw-w64-%CMAKE_PLATFORM%-libsndfile
cd %APPVEYOR_BUILD_FOLDER%
- git submodule update --init --recursive

# Assumes that we use the vx.y.z tagging scheme (e.g. v1.3.0)
Expand Down

0 comments on commit 09ce444

Please sign in to comment.