From 53de69581bd9e69c4795790a00f02098f764dfc9 Mon Sep 17 00:00:00 2001 From: ThirulogeswarenVenkatraman Date: Wed, 28 Aug 2024 20:00:23 +0000 Subject: [PATCH] Fixed workflow file for Linux (#54) * Update linux.yml * Update linux.yml * Update linux.yml * Update linux.yml * removed 5sec run test --- .github/workflows/linux.yml | 12 +++++------- Samples/ModelLoading/xmake.lua | 1 - 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 6b311f8..af51f37 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -17,7 +17,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 strategy: fail-fast: false @@ -31,6 +31,9 @@ jobs: run: echo "key=$(date +'%W')" >> $GITHUB_ENV shell: bash + - name: installing OpenGL + run: sudo apt-get install -y libgl-dev + - name: Checkout repository uses: actions/checkout@v4 @@ -47,17 +50,12 @@ jobs: - name: Update xmake repository run: xmake repo --update - - name: Retrieve dependencies hash - id: dep_hash - run: echo "hash=$(xmake l utils.ci.packageskey)" >> $GITHUB_ENV - shell: bash - - name: Restore cached xmake dependencies id: restore-depcache uses: actions/cache/restore@v4 with: path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages - key: ${{ matrix.rhi }}-${{ matrix.prj }}-${{ env.hash }}-W${{ env.key }} + key: ${{ matrix.rhi }}-${{ matrix.prj }}-W${{ env.key }} - name: Check xmake packages directory exists shell: bash diff --git a/Samples/ModelLoading/xmake.lua b/Samples/ModelLoading/xmake.lua index 2258416..c1eca4e 100644 --- a/Samples/ModelLoading/xmake.lua +++ b/Samples/ModelLoading/xmake.lua @@ -45,5 +45,4 @@ target("ModelLoading") end add_tests("compile_pass", {build_should_pass = true}) - add_tests("run_5_seconds", { runargs = {"-test"} }) target_end()