Skip to content

Commit

Permalink
more fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
externl committed Dec 22, 2023
1 parent f2869b8 commit e0fbfba
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/actions/test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ runs:
if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos')

- name: Test
run: python allTests.py --platform=x64 --workers=3 --language=${{ inputs.language }} ${{ inputs.flags }}}
run: python allTests.py --platform=x64 --workers=3 --language=${{ inputs.language }} ${{ inputs.flags }}
shell: powershell
if: startsWith(matrix.os, 'windows')
11 changes: 8 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,14 @@ jobs:
- language: swift
os: macos-latest
- language: php
os: [ubuntu-latest, macos-latest]
os: macos-latest
- language: php
os: ubuntu-latest
- language: ruby
os: [ubuntu-latest, macos-latest]
os: macos-latest
- language: ruby
os: ubuntu-latest
fail-fast: false

runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -56,7 +61,7 @@ jobs:
- name: Build ${{ matrix.os }}
uses: ./.github/actions/build

- name: Build ${{ matrix.os }}
- name: Test ${{ matrix.os }}
uses: ./.github/actions/test
with:
language: ${{ matrix.language }}
12 changes: 4 additions & 8 deletions ice.proj
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<Platform Condition="'$(Platform)' == ''">Win32</Platform>
Expand Down Expand Up @@ -31,16 +32,11 @@
</ItemGroup>

<Target Name="Build">
<MSBuild Projects="@(Projects)"
BuildInParallel="false"
Properties="%(Properties)" />
<MSBuild Projects="@(Projects)" BuildInParallel="false" Properties="%(Properties)" />
</Target>

<Target Name="Clean">
<MSBuild Projects="@(Projects)"
BuildInParallel="false"
Targets="Clean"
Properties="Platform=$(Platform);Configuration=%(Configuration)" />
<MSBuild Projects="@(Projects)" BuildInParallel="false" Targets="Clean" Properties="Platform=$(Platform);Configuration=%(Configuration)" />
</Target>

</Project>

0 comments on commit e0fbfba

Please sign in to comment.