From ffc65a5f47a0815577c1812f214cfde3a3b9070c Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon, 24 Aug 2020 17:00:05 +0200
Subject: Platform include should be last

    * .github/workflows/linux.yml:
---
 .github/workflows/linux.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index b95fa511838..92c8dae6d36 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -134,13 +134,9 @@ jobs:
       run: |
         '#include "ace/config-linux.h"' > ${env:ACE_ROOT}/ace/config.h
       shell: pwsh
-    - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU
-      run: |
-        '${{ matrix.platform_file }}' >  ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
-      shell: pwsh
     - name: extend $ACE_ROOT/include/makeinclude/platform_macros.GNU
       run: |
-        'ipv6=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
+        'ipv6=1' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
         'xerces3=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
         'ssl=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
       shell: pwsh
@@ -149,6 +145,10 @@ jobs:
         '${{ matrix.optional_macros }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
       shell: pwsh
       if: matrix.optional_macros != ''
+    - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU
+      run: |
+        '${{ matrix.platform_file }}' >>  ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
+      shell: pwsh
     - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features
       run: |
         'ipv6=1' > ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
-- 
cgit v1.2.1