change gcc, remove versions

mrp089 · Oct 17, 2023 · 4bde786 · 4bde786
1 parent 5dc35ac
commit 4bde786
Showing 1 changed file with 14 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
  runs-on: macos-latest
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  - name: Build
  shell: bash
  run: |
@@ -23,8 +23,6 @@ jobs:
  export LIBRARY_PATH='/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib:/opt/local/lib'
  export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
  export LDFLAGS=-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib
- export CXX=/usr/bin/g++
- export CC=/usr/bin/gcc
  mkdir Build
  cd Build
  cmake .. -DSV_ENABLE_DISTRIBUTION=ON
@@ -34,35 +32,33 @@ jobs:
  run: |
  cd Build/SimVascular-build
  cpack
- cp SimVascular*.dmg ../../SimVascular-macOS-BigSur.dmg
+ cp SimVascular*.dmg ../../SimVascular-macOS.dmg
  - name: Upload artifact
  uses: actions/upload-artifact@v3
  with:
- name: macOS Big Sur Installer
- path: SimVascular-macOS-BigSur.dmg
+ name: macOS Installer
+ path: SimVascular-macOS.dmg
  if-no-files-found: error
  - name: Upload release asset
  if: startsWith(github.ref, 'refs/tags/')
  uses: svenstaro/upload-release-action@v2
  with:
  repo_token: ${{ secrets.GITHUB_TOKEN }}
- file: SimVascular-macOS-BigSur.dmg
- asset_name: SimVascular-${{github.ref_name}}-macOS-BigSur.dmg
+ file: SimVascular-macOS.dmg
+ asset_name: SimVascular-${{github.ref_name}}-macOS.dmg
  tag: ${{ github.ref }}
 
  build-ubuntu:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  - name: Install dependencies
  shell: bash
- run: sudo apt-get install libglu1-mesa-dev libxt-dev libxi-dev libglew-dev libxmu-dev gcc-8 g++-8 qt5-default zip
+ run: sudo apt-get install libglu1-mesa-dev libxt-dev libxi-dev libglew-dev libxmu-dev qt5-default zip
  - name: Build
  shell: bash
  run: |
- export CC=/usr/bin/gcc-8
- export CXX=/usr/bin/g++-8
  mkdir Build
  cd Build
  cmake .. -DSV_ENABLE_DISTRIBUTION=ON
@@ -72,26 +68,26 @@ jobs:
  run: |
  cd Build/SimVascular-build
  cpack
- cp SimVascular*.deb ../../SimVascular-Ubuntu-20.deb
+ cp SimVascular*.deb ../../SimVascular-Ubuntu.deb
  - name: Upload artifact
  uses: actions/upload-artifact@v3
  with:
- name: Ubuntu 20 Installer
- path: SimVascular-Ubuntu-20.deb
+ name: Ubuntu Installer
+ path: SimVascular-Ubuntu.deb
  if-no-files-found: error
  - name: Upload release asset
  if: startsWith(github.ref, 'refs/tags/')
  uses: svenstaro/upload-release-action@v2
  with:
  repo_token: ${{ secrets.GITHUB_TOKEN }}
- file: SimVascular-Ubuntu-20.deb
- asset_name: SimVascular-${{github.ref_name}}-Ubuntu-20.deb
+ file: SimVascular-Ubuntu.deb
+ asset_name: SimVascular-${{github.ref_name}}-Ubuntu.deb
  tag: ${{ github.ref }}
  build-windows:
  runs-on: windows-latest
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  - name: Install Cygwin
  uses: cygwin/cygwin-install-action@master
  with: