Skip to content

Commit

Permalink
BLD: Get Rid of set-env/add-pathg (#31)
Browse files Browse the repository at this point in the history
* BLD: Get Rid of set-env

* get rid of add-path as well
  • Loading branch information
gerrymanoim authored Oct 27, 2020
1 parent 0c1da52 commit 4074990
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ jobs:
- name: Set gcc envvars
if: steps.check.outputs.triggered == 'true'
run: |
echo ::set-env name=CC::gcc-9
echo ::set-env name=CXX::g++-9
echo "CC=gcc-9" >> $GITHUB_ENV
echo "CXX=g++-9" >> $GITHUB_ENV
- name: Install python dependencies
if: steps.check.outputs.triggered == 'true'
env:
Expand All @@ -51,4 +51,4 @@ jobs:
if: steps.check.outputs.triggered == 'true'
with:
name: benchmark-artifact
path: benchmarks.txt
path: benchmarks.txt
22 changes: 11 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ jobs:
- name: Set release name env variable (ubuntu)
if: startsWith(matrix.os, 'ubuntu')
run: |
echo ::set-env name=UBUNTU_RELEASE::$(lsb_release -sc)
echo "UBUNTU_RELEASE=$(lsb_release -sc)" >> $GITHUB_ENV
- name: Install newer clang (ubuntu)
if: startsWith(matrix.os, 'ubuntu') && matrix.compiler == 'clang'
run: |
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add -
sudo add-apt-repository "deb http://apt.llvm.org/$UBUNTU_RELEASE/ llvm-toolchain-$UBUNTU_RELEASE-10 main" -y
sudo apt-get update -q
sudo apt-get install -y clang-10 lld-10 libc++-10-dev libc++abi-10-dev clang-tools-10
echo ::set-env name=AR::llvm-ar-10
echo "AR=llvm-ar-10" >> $GITHUB_ENV
- name: Install newer clang (macos)
if: startsWith(matrix.os, 'macos') && matrix.compiler == 'clang'
run: |
Expand All @@ -45,21 +45,21 @@ jobs:
- name: Set llvm related envvars (macos)
if: startsWith(matrix.os, 'macos')
run: |
echo ::set-env name=EXTRA_INCLUDE_DIRS::/usr/local/include/
echo ::add-path::/usr/local/opt/llvm/bin
echo ::set-env name=LDFLAGS::-L/usr/local/opt/llvm/lib
echo ::set-env name=CPPFLAGS::-I/usr/local/opt/llvm/include
echo ::set-env name=AR::llvm-ar
echo "EXTRA_INCLUDE_DIRS=/usr/local/include/" >> $GITHUB_ENV
echo "/usr/local/opt/llvm/bin" >> $GITHUB_PATH
echo "LDFLAGS=-L/usr/local/opt/llvm/lib" >> $GITHUB_ENV
echo "CPPFLAGS=-I/usr/local/opt/llvm/include" >> $GITHUB_ENV
echo "AR=llvm-ar" >> $GITHUB_ENV
- name: Set clang envvars
if: matrix.compiler == 'clang'
run: |
echo ::set-env name=CC::clang-10
echo ::set-env name=CXX::clang++
echo "CC=clang-10" >> $GITHUB_ENV
echo "CXX=clang++" >> $GITHUB_ENV
- name: Set gcc envvars
if: matrix.compiler == 'gcc'
run: |
echo ::set-env name=CC::gcc-9
echo ::set-env name=CXX::g++-9
echo "CC=gcc-9" >> $GITHUB_ENV
echo "CXX=g++-9" >> $GITHUB_ENV
- name: Install python dependencies
env:
PYTHONWARNINGS: ignore:DEPRECATION::pip._internal.cli.base_command
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:
python-version: 3.8
- name: Set gcc envvars
run: |
echo ::set-env name=CC::gcc-9
echo ::set-env name=CXX::g++-9
echo "CC=gcc-9" >> $GITHUB_ENV
echo "CXX=g++-9" >> $GITHUB_ENV
- name: Install python dependencies
env:
PYTHONWARNINGS: ignore:DEPRECATION::pip._internal.cli.base_command
Expand Down

0 comments on commit 4074990

Please sign in to comment.