Fix artifacts building steps (#336)

* Update main.yml * Update main.yml * Update python_tests.sh * Update main.yml * Update VERSION * Update main.yml * Update VERSION * Update main.yml * Update python_tests.sh
RGF-team · Feb 20, 2021 · 1331b46 · 1331b46
1 parent caf6ee6
commit 1331b46
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.ci/python_tests.sh b/.ci/python_tests.sh
@@ -16,8 +16,8 @@ else
  if [[ $TASK != "R_PACKAGE" ]]; then
  add-apt-repository -y ppa:ubuntu-toolchain-r/test
  apt-get update
- apt-get install --no-install-recommends -y g++-5
- export CXX=g++-5 && export CC=gcc-5
+ apt-get install --no-install-recommends -y "g++-$GCC_VER_LINUX"
+ export CXX="g++-$GCC_VER_LINUX" && export CC="gcc-$GCC_VER_LINUX"
  fi
  curl -sL https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -o miniconda.sh
 fi

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,6 +8,9 @@ on:
  branches:
  - master
 
+env:
+ GCC_VER_MACOS: '10'
+ GCC_VER_LINUX: '5'
 jobs:
  test:
  name: ${{ matrix.task == 'R_PACKAGE' && format('R {0}', matrix.os) || format('Python {0} ({1})', matrix.python_version, matrix.os) }}
@@ -62,7 +65,7 @@ jobs:
  export PATH="$CONDA_PATH/bin:$PATH"
  export TASK="${{ matrix.task }}"
  if [[ $OS_NAME == "macos-latest" ]]; then
- export CXX=g++-10 && export CC=gcc-10
+ export CXX=g++-${{ env.GCC_VER_MACOS }} && export CC=gcc-${{ env.GCC_VER_MACOS }}
  fi
  export RGF_VER=$(head -n 1 $GITHUB_WORKSPACE/python-package/rgf/VERSION)
  echo "RGF_VER=$RGF_VER" >> $GITHUB_ENV
@@ -76,6 +79,11 @@ jobs:
  run: |
  export PATH="${{ env.CONDA_PATH }}/bin:$PATH"
  source activate ${{ env.CONDA_ENV }}
+ if [[ ${{ matrix.os }} == "macos-latest" ]]; then
+ export CXX=g++-${{ env.GCC_VER_MACOS }} && export CC=gcc-${{ env.GCC_VER_MACOS }}
+ else
+ export CXX=g++-${{ env.GCC_VER_LINUX }} && export CC=gcc-${{ env.GCC_VER_LINUX }}
+ fi
  cd $GITHUB_WORKSPACE/python-package
  if [[ ${{ matrix.os }} == "macos-latest" ]]; then
  python setup.py bdist_wheel --plat-name=macosx --python-tag py3;