From e2d34a52acd52a063b1345baade7a0aa195ec652 Mon Sep 17 00:00:00 2001 From: Josh Tynjala Date: Tue, 2 May 2023 09:19:51 -0700 Subject: [PATCH] actions: simplify Neko and HashLink samples jobs --- .github/workflows/main.yml | 65 +++----------------------------------- 1 file changed, 4 insertions(+), 61 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5a1d9df75..4cc154691 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -552,50 +552,21 @@ jobs: hashlink-samples: needs: package-haxelib - strategy: - matrix: - os: [ubuntu-20.04 - , macos-11, windows-latest] - runs-on: ${{ matrix.os }} + runs-on: ubuntu-20.04 steps: - uses: krdlab/setup-haxe@v1 with: haxe-version: 4.2.5 - - name: Set HAXEPATH (Windows) - if: ${{ startsWith(matrix.os, 'windows-') }} - run: | - echo "HAXEPATH=$Env:HAXE_STD_PATH\.." >> $Env:GITHUB_ENV - - - name: Set HAXEPATH (macOS/Linux) - if: ${{ !startsWith(matrix.os, 'windows-') }} + - name: Set HAXEPATH run: | echo "HAXEPATH=$HAXE_STD_PATH/.." >> $GITHUB_ENV - - name: Install system dependencies (Linux) - if: ${{ startsWith(matrix.os, 'ubuntu-') }} - run: | - sudo apt-get update - sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev g++-multilib gcc-multilib libasound2-dev libx11-dev libxext-dev libxi-dev libxrandr-dev libxinerama-dev - - name: Install Haxe dependencies run: | - haxelib install hxcpp 4.2.1 --quiet - haxelib install format --quiet - haxelib install hxp --quiet haxelib git lime-samples https://github.com/openfl/lime-samples --quiet - - name: Enable HXCPP compile cache (Windows) - if: ${{ startsWith(matrix.os, 'windows-') }} - run: | - echo "HXCPP_COMPILE_CACHE=C:\.hxcpp" >> $Env:GITHUB_ENV - - - name: Enable HXCPP compile cache (macOS/Linux) - if: ${{ !startsWith(matrix.os, 'windows-') }} - run: | - echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV - - uses: actions/download-artifact@v3 with: name: lime-haxelib @@ -809,49 +780,21 @@ jobs: neko-samples: needs: package-haxelib - strategy: - matrix: - os: [ubuntu-20.04, macos-11, windows-latest] - runs-on: ${{ matrix.os }} + runs-on: ubuntu-20.04 steps: - uses: krdlab/setup-haxe@v1 with: haxe-version: 4.2.5 - - name: Set HAXEPATH (Windows) - if: ${{ startsWith(matrix.os, 'windows-') }} - run: | - echo "HAXEPATH=$Env:HAXE_STD_PATH\.." >> $Env:GITHUB_ENV - - - name: Set HAXEPATH (macOS/Linux) - if: ${{ !startsWith(matrix.os, 'windows-') }} + - name: Set HAXEPATH run: | echo "HAXEPATH=$HAXE_STD_PATH/.." >> $GITHUB_ENV - - name: Install system dependencies (Linux) - if: ${{ startsWith(matrix.os, 'ubuntu-') }} - run: | - sudo apt-get update - sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev g++-multilib gcc-multilib libasound2-dev libx11-dev libxext-dev libxi-dev libxrandr-dev libxinerama-dev - - name: Install Haxe dependencies run: | - haxelib install hxcpp 4.2.1 --quiet - haxelib install format --quiet - haxelib install hxp --quiet haxelib git lime-samples https://github.com/openfl/lime-samples --quiet - - name: Enable HXCPP compile cache (Windows) - if: ${{ startsWith(matrix.os, 'windows-') }} - run: | - echo "HXCPP_COMPILE_CACHE=C:\.hxcpp" >> $Env:GITHUB_ENV - - - name: Enable HXCPP compile cache (macOS/Linux) - if: ${{ !startsWith(matrix.os, 'windows-') }} - run: | - echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV - - uses: actions/download-artifact@v3 with: name: lime-haxelib