From 3a1ba380f4114564cf4083d369bce82513aa282f Mon Sep 17 00:00:00 2001 From: Jerboa-app Date: Sun, 24 Nov 2024 11:02:04 +0000 Subject: [PATCH] rename --- .github/workflows/android.yml | 6 +++--- .github/workflows/linux.yml | 32 +++++++++++++++--------------- .github/workflows/macos.yml | 8 ++++---- .github/workflows/release.yml | 37 +++++++++++++++++------------------ .github/workflows/windows.yml | 33 ++++++++++++++++--------------- 5 files changed, 58 insertions(+), 58 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 9ba2b5b7..56230150 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -1,4 +1,4 @@ -name: Hop android tests +name: Hop android on: pull_request: @@ -49,7 +49,7 @@ jobs: include/vendored/sparsehash; do cp -r $inc headers; done - - name: Install dependencies + - name: install dependencies run: | sudo apt-get update && sudo apt-get install -y build-essential mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools wget https://dl.google.com/android/repository/android-ndk-r25c-linux.zip @@ -66,7 +66,7 @@ jobs: ./cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-34" echo no | ./cmdline-tools/latest/bin/avdmanager create avd --name android34 --package "system-images;android-34;google_apis;x86_64" - - name: build hop + - name: build run: | ./build.sh -r --android android-ndk-r25c diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index b0dde9a2..abf3545e 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -14,7 +14,7 @@ jobs: with: submodules: 'recursive' - - name: Install dependencies + - name: install dependencies run: sudo apt-get update && sudo apt-get install -y build-essential xorg-dev mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev libxinerama-dev libxcursor-dev vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools - name: pack headers @@ -53,10 +53,10 @@ jobs: include/vendored/sparsehash; do cp -r $inc headers; done - - name: linux-linux + - name: build run: ./build.sh -t -d -r - - name: Tests + - name: unit tests working-directory: ${{github.workspace}}/build # Execute tests defined by the CMake configuration. # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail @@ -66,6 +66,15 @@ jobs: sleep 5 MESA_GL_VERSION_OVERRIDE=3.3 ctest --output-on-failure --verbose + - name: regression + run: | + mkdir tests/regression/user/include/ + cp build/*.a tests/regression/user/ + cp -r headers/* tests/regression/user/include/ + cd tests/regression/user + mkdir build && cd build + cmake .. && make + linuxBuildAndRun: runs-on: ubuntu-22.04 @@ -78,10 +87,10 @@ jobs: with: submodules: 'recursive' - - name: Install dependencies + - name: install dependencies run: sudo apt-get update && sudo apt-get install -y build-essential xorg-dev mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev libxinerama-dev libxcursor-dev xvfb x11-apps vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools - - name: linux-linux + - name: build run: | ./build.sh -t -r -d @@ -98,17 +107,8 @@ jobs: xwd -root -silent | convert xwd:- png:screenshot.png sleep 5 && kill $PID - - name: upload artifact + - name: upload screenshot uses: actions/upload-artifact@v4 with: name: ${{ matrix.example }}.png - path: build/${{ matrix.example }}/screenshot.png - - - name: regression - run: | - mkdir tests/regression/user/include/ - cp build/*.a tests/regression/user/ - cp -r headers/* tests/regression/user/include/ - cd tests/regression/user - mkdir build && cd build - cmake .. && make \ No newline at end of file + path: build/${{ matrix.example }}/screenshot.png \ No newline at end of file diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index d890108e..b7053d63 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -1,4 +1,4 @@ -name: Hop macOS tests +name: Hop macOS on: pull_request: @@ -13,7 +13,7 @@ jobs: with: submodules: 'recursive' - - name: Install dependencies + - name: install dependencies run: | wget https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.zip -O vulkan-sdk.zip unzip vulkan-sdk.zip @@ -58,7 +58,7 @@ jobs: include/vendored/sparsehash; do cp -r $inc headers; done - - name: macos build + - name: build run: | git submodule update --recursive ./build.sh -o -d -r -t @@ -71,7 +71,7 @@ jobs: cp -r build/PerlinWorld demos/ cd demos && zip -r ../demos.zip * && cd .. - - name: Tests + - name: unit tests working-directory: ${{github.workspace}}/build # Execute tests defined by the CMake configuration. # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 971530b4..e1e601a5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,6 @@ on: - 'doc/**' - '.github/**' workflow_dispatch: - pull_request: jobs: @@ -89,10 +88,10 @@ jobs: with: submodules: 'recursive' - - name: Install dependencies + - name: install dependencies run: sudo apt-get update && sudo apt-get install -y build-essential xorg-dev mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev libxinerama-dev libxcursor-dev vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools - - name: linux-linux + - name: build run: | git submodule update --recursive ./build.sh -t -d -r @@ -105,7 +104,7 @@ jobs: cp -r build/PerlinWorld demos/ cd demos && zip -r ../demos.zip * && cd .. - - name: Tests + - name: unit tests working-directory: ${{github.workspace}}/build # Execute tests defined by the CMake configuration. # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail @@ -135,10 +134,10 @@ jobs: with: submodules: 'recursive' - - name: Install dependencies + - name: install dependencies run: sudo apt-get update && sudo apt-get install -y xorg-dev build-essential mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev g++-mingw-w64-x86-64-posix gcc-mingw-w64-x86-64-posix libxinerama-dev libxcursor-dev vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools wine64 - - name: linux-X-windows + - name: build run: | git submodule update --recursive ./build.sh -w -d -r -t @@ -154,7 +153,7 @@ jobs: cd demos && zip -r ../demos.zip * && cd .. cp build/*.dll build/TestScriptPack/ - - name: Tests (wine64) + - name: unit tests working-directory: ${{github.workspace}}/build # Execute tests defined by the CMake configuration. # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail @@ -185,7 +184,7 @@ jobs: with: submodules: 'recursive' - - name: Install dependencies + - name: install dependencies run: | wget https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.zip -O vulkan-sdk.zip unzip vulkan-sdk.zip @@ -194,7 +193,7 @@ jobs: cd ~/vulkan/ python install_vulkan.py - - name: macos build + - name: build run: | git submodule update --recursive ./build.sh -o -d -r -t @@ -207,7 +206,7 @@ jobs: cp -r build/PerlinWorld demos/ cd demos && zip -r ../demos.zip * && cd .. - - name: Tests + - name: unit tests working-directory: ${{github.workspace}}/build # Execute tests defined by the CMake configuration. # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail @@ -230,7 +229,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - name: Install dependencies + - name: install dependencies run: sudo apt-get update && sudo apt-get install -y xvfb x11-apps imagemagick - name: get linux demos @@ -278,7 +277,7 @@ jobs: with: submodules: 'recursive' - - name: Install dependencies + - name: install dependencies run: | sudo apt-get update && sudo apt-get install -y build-essential mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools wget https://dl.google.com/android/repository/android-ndk-r25c-linux.zip @@ -295,7 +294,7 @@ jobs: ./cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-34" echo no | ./cmdline-tools/latest/bin/avdmanager create avd --name android34 --package "system-images;android-34;google_apis;x86_64" - - name: build hop + - name: build run: | git submodule update --recursive ./build.sh -r --android android-ndk-r25c @@ -371,10 +370,10 @@ jobs: with: name: linuxbuild - - name: Install dependencies + - name: install dependencies run: sudo apt-get update && sudo apt-get install -y xorg-dev build-essential mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev g++-mingw-w64-x86-64-posix gcc-mingw-w64-x86-64-posix libxinerama-dev libxcursor-dev vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools xvfb x11-apps imagemagick - - name: linux lib test + - name: regression run: | ls mv libHop-linux-x86_64.a libHop.a @@ -407,10 +406,10 @@ jobs: with: name: windowsbuild - - name: Install dependencies + - name: install dependencies run: sudo apt-get update && sudo apt-get install -y xorg-dev build-essential mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev g++-mingw-w64-x86-64-posix gcc-mingw-w64-x86-64-posix libz-mingw-w64-dev libxinerama-dev libxcursor-dev vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools xvfb x11-apps imagemagick - - name: mingw lib test + - name: regression run: | ls mv libHop-windows.a libHop.a @@ -441,7 +440,7 @@ jobs: with: name: macosbuild - - name: Install dependencies + - name: install dependencies run: | wget https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.zip -O vulkan-sdk.zip unzip vulkan-sdk.zip @@ -450,7 +449,7 @@ jobs: cd ~/vulkan/ python install_vulkan.py - - name: macos lib test + - name: regression run: | ls mv libHop-macos.a libHop.a diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8d25b93c..a150555b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -1,4 +1,4 @@ -name: Hop wine tests +name: Hop windows on: pull_request: @@ -58,13 +58,13 @@ jobs: cp -r include/jGL/include/vendored/VulkanSDK/Include headers-mingw/VulkanSDK/ cp -r include/jGL/include/vendored/VulkanSDK/Windows headers-mingw/VulkanSDK/ - - name: Install dependencies + - name: install dependencies run: sudo apt-get update && sudo apt-get install -y xorg-dev build-essential mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev g++-mingw-w64-x86-64-posix gcc-mingw-w64-x86-64-posix libxinerama-dev libxcursor-dev vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools wine64 - - name: linux-X-windows + - name: build run: ./build.sh -w -d -r -t - - name: Tests (wine64) + - name: unit tests working-directory: ${{github.workspace}}/build # Execute tests defined by the CMake configuration. # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail @@ -75,6 +75,14 @@ jobs: sleep 5 MESA_GL_VERSION_OVERRIDE=3.3 ctest --output-on-failure --verbose --exclude-regex Vulkan + - name: regression + run: | + mkdir tests/regression/user-mingw/include/ + cp build/*.a tests/regression/user-mingw/ + cp -r headers-mingw/* tests/regression/user-mingw/include/ + cd tests/regression/user-mingw + ./build.sh + wineBuildAndRun: if: ${{ github.event_name == 'workflow_dispatch' }} runs-on: ubuntu-22.04 @@ -88,9 +96,10 @@ jobs: with: submodules: 'recursive' - - name: Install dependencies + - name: install dependencies run: sudo apt-get update && sudo apt-get install -y xorg-dev build-essential mesa-common-dev libx11-dev libxrandr-dev libgl1-mesa-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev libudev-dev g++-mingw-w64-x86-64-posix gcc-mingw-w64-x86-64-posix libxinerama-dev libxcursor-dev xvfb x11-apps vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools wine64 - - name: linux-windows + + - name: build run: | ./build.sh -r -w -d @@ -107,16 +116,8 @@ jobs: xwd -root -silent | convert xwd:- png:screenshot.png sleep 5 && kill $PID - - name: upload artifact + - name: upload screenshots uses: actions/upload-artifact@v4 with: name: ${{ matrix.example }}-wine.png - path: build/${{ matrix.example }}/screenshot.png - - - name: regression - run: | - mkdir tests/regression/user-mingw/include/ - cp build/*.a tests/regression/user-mingw/ - cp -r headers-mingw/* tests/regression/user-mingw/include/ - cd tests/regression/user-mingw - ./build.sh \ No newline at end of file + path: build/${{ matrix.example }}/screenshot.png \ No newline at end of file