Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
externl committed Dec 21, 2023
1 parent 1986d80 commit bf62ff8
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 90 deletions.
1 change: 1 addition & 0 deletions .github/actions/build/action.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Build Ice

runs:
using: "composite"
steps:
- name: Build
run: |
Expand Down
1 change: 1 addition & 0 deletions .github/actions/test/action.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Test Ice

runs:
using: "composite"
steps:
- name: Test
run: python allTests.py --workers=3
Expand Down
102 changes: 12 additions & 90 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,98 +31,20 @@ jobs:
key: ${{ runner.os }}-build
if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos')

- name: Window Cache
if: startsWith(matrix.os, 'windows')
uses: actions/cache@v3
with:
path: |
**/bin
**/obj
key: ${{ runner.os }}-build-${{ github.sha }}
restore-keys: |
${{ runner.os }}-build-${{ github.sha }}
${{ runner.os }}-build-
- name: Build
uses: ./.github/actions/build

- name: Test
run: python3 allTests.py --workers=3

# runs-on: ${{ matrix.os }}
# needs: build-ice
# steps:
# - name: Configure Test Dependencies
# uses: ./.github/actions/configure-test-dependencies
# - name: Checkout repository
# uses: actions/checkout@v3
# - name: Setup ccache
# uses: hendrikmuhs/[email protected]
# with:
# key: ${{ runner.os }}-build
# if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos')
# - name: Test
# run: python3 allTests.py --workers=3

# linux-latest:
# runs-on: [ubuntu-latest]
# steps:
# - name: Install dependencies
# run: sudo apt-get install -y python3 python3-pip nodejs libbz2-dev libssl-dev libffi-dev libmcpp-dev libedit-dev liblmdb-dev libexpat1-dev libsystemd-dev openjdk-17-jdk ruby ruby-dev php-cli php-dev
# - name: Install test dependencies
# run: python3 -m pip install passlib cryptography
# - name: Checkout repository
# uses: actions/checkout@v3
# - name: Setup ccache
# uses: hendrikmuhs/[email protected]
# with:
# key: ${{ runner.os }}-build
# - name: Build
# run: |
# export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
# make -j3 V=1
# - name: Test
# run: python3 allTests.py --workers=3

# macos-latest:
# runs-on: [macos-latest]
# steps:
# - name: Install brew dependencies
# run: brew install python3 ruby openjdk node php lmdb mcpp
# - name: Install test dependencies
# run: python3 -m pip install passlib cryptography
# - name: Checkout repository
# uses: actions/checkout@v3
# - name: Setup ccache
# uses: hendrikmuhs/[email protected]
# with:
# key: ${{ runner.os }}-build
# - name: Build
# run: |
# export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
# make -j3 V=1
# - name: Test
# run: python3 allTests.py --workers=3

# windows-latest:
# runs-on: [windows-latest]
# steps:
# # - name: Install dependencies
# # run: choco --yes install
# - name: Setup MSBuild
# uses: microsoft/[email protected]
# with:
# msbuild-architecture: x64
# - name: Setup Python
# uses: actions/setup-python@v5
# with:
# python-version: "3.12"
# - name: Install test dependencies
# run: python -m pip install passlib cryptography python-dev-tools
# - name: Checkout repository
# uses: actions/checkout@v3
# - name: Cache
# uses: actions/cache@v3
# with:
# path: |
# **/bin
# **/obj
# key: ${{ runner.os }}-build-${{ github.sha }}
# restore-keys: |
# ${{ runner.os }}-build-${{ github.sha }}
# ${{ runner.os }}-build-
# - name: Configure Environment
# run: |
# echo "PythonHome=$env:Python_ROOT_DIR" >> $env:GITHUB_ENV
# - name: Build
# run: msbuild /m /p:Platform=x64 ice.proj
# - name: Test
# run: python allTests.py --platform=x64 --workers=3

0 comments on commit bf62ff8

Please sign in to comment.