add ubuntu in test. delete win support

megvii-research · Aug 27, 2021 · 74dbee8 · 74dbee8
1 parent 796f002
commit 74dbee8
Showing 1 changed file with 11 additions and 48 deletions.
diff --git a/.github/workflows/on-push.yaml b/.github/workflows/on-push.yaml
@@ -8,8 +8,7 @@ jobs:
  runs-on: ${{ matrix.os }}
  strategy:
  matrix:
- # os: [ubuntu-18.04, macos-latest]
- os: [macos-latest]
+ os: [ubuntu-18.04, macos-latest]
 
  steps:
  - name: Checkout Github Repository
@@ -20,47 +19,21 @@ jobs:
  id: jfs-version
  run: echo "::set-output name=JUICEFS_VERSION::$(make -s print_libjfs_version)"
 
- - name: Cache juicefs and libjfs binary linux/windows
+ - name: Cache juicefs and libjfs binary linux/mac
  if: matrix.os == 'ubuntu-18.04'
  uses: actions/cache@v2
- id: jfs-cache-win-linux
- with:
- path: |
- ./juicefs/lib/libjfs.so
- ./juicefs/lib/libjfs.dll
- ./juicefs/lib/juicefs
- ./juicefs/lib/juicefs.exe
- key: ${{ matrix.os }}-jfs-binary-${{ steps.jfs-version.outputs.JUICEFS_VERSION }}
- - name: Cache juicefs and libjfs mac
- if: matrix.os == 'macos-latest'
- uses: actions/cache@v2
- id: jfs-cache-mac
+ id: jfs-cache
  with:
  path: |
  ./juicefs/lib/libjfs.so
  ./juicefs/lib/juicefs
  key: ${{ matrix.os }}-jfs-binary-${{ steps.jfs-version.outputs.JUICEFS_VERSION }}
 
-
- - name: Run build-libjfs linux and windows
- if: ${{ matrix.os == 'ubuntu-18.04' && steps.jfs-cache-win-linux.outputs.cache-hit != 'true' }}
- run: |
- make build_libjfs_so
- make build_libjfs_dll
- - name: Run build-libjfs macos
- if: ${{ matrix.os == 'macos-latest' && steps.jfs-cache-mac.outputs.cache-hit != 'true' }}
+ - name: Run build-libjfs linux/mac
+ if: ${{ steps.jfs-cache.outputs.cache-hit != 'true' }}
  run: |
  make build_libjfs_so
 
- - name: Upload windows jfs binary
- if: matrix.os == 'ubuntu-18.04'
- uses: actions/upload-artifact@v2
- with:
- name: jfs-binary-win-${{ steps.jfs-version.outputs.JUICEFS_VERSION }}
- path: |
- ./juicefs/lib/libjfs.dll
- ./juicefs/lib/juicefs.exe
- retention-days: 1
  - name: Upload linux jfs binary
  if: matrix.os == 'ubuntu-18.04'
  uses: actions/upload-artifact@v2
@@ -85,21 +58,17 @@ jobs:
  runs-on: ${{ matrix.os }}
  strategy:
  matrix:
- # os: [ubuntu-18.04, macos-latest, windows-latest]
- # python-version: [3.6, 3.7, 3.8, 3.9]
- os: [macos-latest]
- python-version: [3.6]
+ os: [macos-latest, ubuntu-18.04]
+ python-version: [3.6, 3.7, 3.8, 3.9]
  include:
- # - os: ubuntu-18.04
- # pip-path: /opt/hostedtoolcache/Python
- # libjfs-path: /opt/hostedtoolcache/Golang
+ - os: ubuntu-18.04
+ os-key: linux
+ pip-path: /opt/hostedtoolcache/Python
+ libjfs-path: /opt/hostedtoolcache/Golang
  - os: macos-latest
  os-key: mac
  pip-path: /Users/runner/hostedtoolcache/Python
  libjfs-path: /Users/runner/hostedtoolcache/Golang
- # - os: windows-latest
- # pip-path: C:\hostedtoolcache\windows\Python
- # libjfs-path: C:\hostedtoolcache\windows\Golang
 
  steps:
  - name: Checkout Github Repository
@@ -123,12 +92,6 @@ jobs:
  - name: Get JuiceFS Version
  id: jfs-version
  run: echo "::set-output name=JUICEFS_VERSION::$(make -s print_libjfs_version)"
- - name: Download jfs binary artifact Windows
- if: ${{ matrix.os == 'windows-latest' }}
- uses: actions/download-artifact@v2
- with:
- name: jfs-binary-win-${{ steps.jfs-version.outputs.JUICEFS_VERSION }}
- path: ./juicefs/lib/
  - name: Download jfs binary artifact Linux/Mac
  if: ${{ matrix.os != 'windows-latest' }}
  uses: actions/download-artifact@v2