fixing ci

This commit is contained in:
2025-04-13 18:52:37 +02:00
parent 512b8b61fe
commit 8e9a38ceb9
9 changed files with 126 additions and 5 deletions

View File

@@ -0,0 +1,88 @@
name: D3D11-Unit-Tests
on:
pull_request:
push:
paths-ignore:
- '.github/workflows/macos-build.yml'
- '.github/workflows/msys2-build.yml'
- '.github/workflows/windows-build.yml'
- '.github/workflows/linux-build.yml'
- '.github/workflows/opengl-es-test.yml'
- '.github/workflows/vulkan-test.yml'
- '.github/workflows/opengl-test.yml'
- '.github/workflows/software-test.yml'
- '.gitignore'
- 'LICENSE'
- 'CHANGELOG.md'
- 'README.md'
jobs:
build:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, "windows-latest"]
arch: [x86_64]
confs:
- { mode: debug, archive: yes }
runs-on: ${{ matrix.os }}
if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
steps:
- name: Get current date as package key
id: cache_key
run: echo "key=$(date +'%W')" >> $GITHUB_OUTPUT
- name: Checkout repository
uses: actions/checkout@v4
# Force xmake to a specific folder (for cache)
- name: Set xmake env
run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" >> $GITHUB_ENV
# Install xmake
- name: Setup xmake
uses: xmake-io/github-action-setup-xmake@v1
with:
xmake-version: branch@dev
actions-cache-folder: .xmake-cache-W${{ steps.cache_key.outputs.key }}
# Update xmake repository (in order to have the file that will be cached)
- name: Update xmake repository
run: xmake repo --update
# Fetch xmake dephash
- name: Retrieve dependencies hash
id: dep_hash
run: echo "hash=$(xmake l utils.ci.packageskey)" >> $GITHUB_OUTPUT
# Cache xmake dependencies
- name: Restore cached xmake dependencies
id: restore-depcache
uses: actions/cache/restore@v4
with:
path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
key: Linux-${{ matrix.arch }}-${{ matrix.confs.mode }}${{ matrix.confs.cache_key }}-${{ steps.dep_hash.outputs.hash }}-W${{ steps.cache_key.outputs.key }}
# Setup compilation mode and install project dependencies
- name: Configure xmake and install dependencies
run: xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.confs.mode }} ${{ matrix.confs.config }} --ccache=n --unitybuild=y --yes
# Save dependencies
- name: Save cached xmake dependencies
if: ${{ !steps.restore-depcache.outputs.cache-hit }}
uses: actions/cache/save@v4
with:
path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
key: ${{ steps.restore-depcache.outputs.cache-primary-key }}
# Cache assets downloading
- name: Restore cached assets
id: restore-assets
uses: actions/cache/restore@v4
with:
path: assets
key: assets-${{ hashFiles('assets/examples_version.txt', 'assets/unittests_version.txt') }}

View File

@@ -34,6 +34,12 @@ jobs:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Detect if running in act
run: |
if grep -q "act" <<< "$GITHUB_ACTOR"; then
echo "XMAKE_ROOT=y" >> $GITHUB_ENV
fi
- uses: NcStudios/VulkanCI@v1.0 - uses: NcStudios/VulkanCI@v1.0
# Install system dependencies # Install system dependencies

View File

@@ -38,6 +38,12 @@ jobs:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Detect if running in act
run: |
if grep -q "act" <<< "$GITHUB_ACTOR"; then
echo "XMAKE_ROOT=y" >> $GITHUB_ENV
fi
# Force xmake to a specific folder (for cache) # Force xmake to a specific folder (for cache)
- name: Set xmake env - name: Set xmake env
run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" >> $GITHUB_ENV run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" >> $GITHUB_ENV

View File

@@ -38,6 +38,12 @@ jobs:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Detect if running in act
run: |
if grep -q "act" <<< "$GITHUB_ACTOR"; then
echo "XMAKE_ROOT=y" >> $GITHUB_ENV
fi
# Force xmake to a specific folder (for cache) # Force xmake to a specific folder (for cache)
- name: Set xmake env - name: Set xmake env
run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" >> $GITHUB_ENV run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" >> $GITHUB_ENV

View File

@@ -38,6 +38,12 @@ jobs:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Detect if running in act
run: |
if grep -q "act" <<< "$GITHUB_ACTOR"; then
echo "XMAKE_ROOT=y" >> $GITHUB_ENV
fi
# Force xmake to a specific folder (for cache) # Force xmake to a specific folder (for cache)
- name: Set xmake env - name: Set xmake env
run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" >> $GITHUB_ENV run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" >> $GITHUB_ENV

View File

@@ -38,6 +38,12 @@ jobs:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Detect if running in act
run: |
if grep -q "act" <<< "$GITHUB_ACTOR"; then
echo "XMAKE_ROOT=y" >> $GITHUB_ENV
fi
- uses: NcStudios/VulkanCI@v1.0 - uses: NcStudios/VulkanCI@v1.0
# Force xmake to a specific folder (for cache) # Force xmake to a specific folder (for cache)
@@ -70,7 +76,7 @@ jobs:
# Setup compilation mode and install project dependencies # Setup compilation mode and install project dependencies
- name: Configure xmake and install dependencies - name: Configure xmake and install dependencies
run: xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.confs.mode }} ${{ matrix.confs.config }} --ccache=n --unitybuild=y --yes run: xmake config --vulkan-tests=y --arch=${{ matrix.arch }} --mode=${{ matrix.confs.mode }} ${{ matrix.confs.config }} --ccache=n --unitybuild=y --yes
# Save dependencies # Save dependencies
- name: Save cached xmake dependencies - name: Save cached xmake dependencies
@@ -88,8 +94,7 @@ jobs:
path: assets path: assets
key: assets-${{ hashFiles('assets/examples_version.txt', 'assets/unittests_version.txt') }} key: assets-${{ hashFiles('assets/examples_version.txt', 'assets/unittests_version.txt') }}
- name: Test - name: Test Vulkan
run: | run: |
xmake config --vulkan-tests=y --arch=${{ matrix.arch }} --mode=${{ matrix.confs.mode }} ${{ matrix.confs.config }} --ccache=n --unitybuild=y --yes
xmake build --yes VulkanUnitTests xmake build --yes VulkanUnitTests
xmake run --yes VulkanUnitTests xmake run --yes VulkanUnitTests

View File

@@ -9,6 +9,10 @@
#ifndef PULSE_OPENGL_H_ #ifndef PULSE_OPENGL_H_
#define PULSE_OPENGL_H_ #define PULSE_OPENGL_H_
#ifdef __STDC_NO_ATOMICS__
#error "Atomic support is not present"
#endif
#define OPENGL_RETRIEVE_DRIVER_DATA_AS(handle, cast) ((cast)handle->driver_data) #define OPENGL_RETRIEVE_DRIVER_DATA_AS(handle, cast) ((cast)handle->driver_data)
#include "OpenGLEnums.h" #include "OpenGLEnums.h"

View File

@@ -225,7 +225,7 @@ PulseDevice OpenGLCreateDevice(PulseBackend backend, PulseDevice* forbiden_devic
#ifdef PULSE_PLAT_WINDOWS #ifdef PULSE_PLAT_WINDOWS
// WGL support // WGL support
if(opengl_device->context_type == OPENGL_CONTEXT_WGL) if(false)
{ {
// TODO: WGL // TODO: WGL
device->context_type = OPENGL_CONTEXT_WGL; device->context_type = OPENGL_CONTEXT_WGL;

View File

@@ -9,7 +9,7 @@ local nzsl_included = false
function nzsl(backend) function nzsl(backend)
if not nzsl_included then if not nzsl_included then
add_repositories("nazara-engine-repo https://github.com/NazaraEngine/xmake-repo") add_repositories("nazara-engine-repo https://github.com/NazaraEngine/xmake-repo")
add_requires("nzsl >=2023.12.31", { configs = { shared = false, nzslc = true } }) add_requires("nzsl", { configs = { shared = false, nzslc = true } })
if is_cross() then if is_cross() then
add_requires("nzsl~host", { kind = "binary", host = true }) add_requires("nzsl~host", { kind = "binary", host = true })
end end