From 073cd1394ffa5323b0de9272929d1e81530a0677 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 26 Aug 2020 12:57:32 +0200 Subject: [PATCH 1/3] Use environment variables for checkout paths * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a3dfc2b..57701ee 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -47,6 +47,7 @@ jobs: ACE_ROOT: ${{ github.workspace }}/ACE_TAO/ACE TAO_ROOT: ${{ github.workspace }}/ACE_TAO/TAO MPC_ROOT: ${{ github.workspace }}/ACE_TAO/MPC + RIDL_ROOT: ${{ github.workspace }}/ridl CC: ${{ matrix.CC }} CXX: ${{ matrix.CXX }} steps: @@ -59,19 +60,19 @@ jobs: uses: actions/checkout@v2 with: repository: DOCGroup/ACE_TAO - path: ACE_TAO + path: ${{ env.DOC_ROOT }} ref: Latest_Micro - name: checkout MPC uses: actions/checkout@v2 with: repository: DOCGroup/MPC - path: ACE_TAO/MPC + path: ${{ env.MPC_ROOT }} ref: Latest_ACETAO_Micro - name: checkout ridl uses: actions/checkout@v2 with: repository: RemedyIT/ridl - path: ridl + path: ${{ env.RIDL_ROOT }} - name: Add Repo run: | wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - From 15977d07858556b63c3383d0973a977ca9c7e7f9 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 26 Aug 2020 13:00:48 +0200 Subject: [PATCH 2/3] Env chagne * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 57701ee..18c700a 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -44,7 +44,8 @@ jobs: runs-on: ${{ matrix.os }} name: ${{ matrix.os }} ${{ matrix.CXX }} ruby-${{ matrix.ruby }} env: - ACE_ROOT: ${{ github.workspace }}/ACE_TAO/ACE + DOC_ROOT: ${{ github.workspace }}/ACE_TAO + ACE_ROOT: ${{ github.workspace }}/${{ env.DOC_ROOT }}/ACE TAO_ROOT: ${{ github.workspace }}/ACE_TAO/TAO MPC_ROOT: ${{ github.workspace }}/ACE_TAO/MPC RIDL_ROOT: ${{ github.workspace }}/ridl From 57903b9095ad03070b72714a25ac555ed634e834 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 26 Aug 2020 13:01:27 +0200 Subject: [PATCH 3/3] Revert test * .github/workflows/linux.yml: --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 18c700a..1c198b3 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -45,7 +45,7 @@ jobs: name: ${{ matrix.os }} ${{ matrix.CXX }} ruby-${{ matrix.ruby }} env: DOC_ROOT: ${{ github.workspace }}/ACE_TAO - ACE_ROOT: ${{ github.workspace }}/${{ env.DOC_ROOT }}/ACE + ACE_ROOT: ${{ github.workspace }}/ACE_TAO/ACE TAO_ROOT: ${{ github.workspace }}/ACE_TAO/TAO MPC_ROOT: ${{ github.workspace }}/ACE_TAO/MPC RIDL_ROOT: ${{ github.workspace }}/ridl