summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2020-06-09 17:12:29 +0200
committerJohnny Willemsen <jwillemsen@remedy.nl>2020-06-09 17:12:29 +0200
commit153af0ed62f2abb0c73b601a7fbc41923b1b44ff (patch)
tree862a5f990be125e341ffcd29e29134e5bb98ec2a
parentebe174f375fb53c4584f3e7e7b212d28771afb78 (diff)
downloadATCD-153af0ed62f2abb0c73b601a7fbc41923b1b44ff.tar.gz
Simplified actions setup
* .github/workflows/linux.yml: * .github/workflows/macosx.yml:
-rw-r--r--.github/workflows/linux.yml2
-rw-r--r--.github/workflows/macosx.yml9
2 files changed, 4 insertions, 7 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index ba711ec5f0f..d1bca0dcc75 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -74,7 +74,7 @@ jobs:
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
os: ubuntu-20.04
runs-on: ${{ matrix.os }}
- name: ${{ matrix.os }} ruby-${{ matrix.CXX }}
+ name: ${{ matrix.os }} ${{ matrix.CXX }}
env:
ACE_ROOT: ${{ github.workspace }}/ACE
TAO_ROOT: ${{ github.workspace }}/TAO
diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml
index 1164edebe9d..71f0fc92009 100644
--- a/.github/workflows/macosx.yml
+++ b/.github/workflows/macosx.yml
@@ -10,14 +10,11 @@ jobs:
build:
strategy:
matrix:
- name: [
- macos1015
- ]
include:
- - name: macos1015
+ - os: macos-10.15
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU
- imagename: macos-10.15
- runs-on: ${{ matrix.imagename }}
+ runs-on: ${{ matrix.os }}
+ name: ${{ matrix.os }}
env:
ACE_ROOT: ${{ github.workspace }}/ACE
TAO_ROOT: ${{ github.workspace }}/TAO