updated archive and remove duplicate windows compilation

overturetool · May 20, 2020 · 998392e · 998392e
1 parent 5f5306e
commit 998392e
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,17 +5,6 @@ on: [push, pull_request]
 
 jobs:
 
-  compileWindows:
-    runs-on: windows-latest
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: 'true'
-      - name: "Build"
-        run: ./scripts/compile-win64.sh
-        shell: bash
-
   compile:
     runs-on: ${{ matrix.config.os }}
 
@@ -81,23 +70,23 @@ jobs:
       - uses: actions/upload-artifact@v2
         if: matrix.config.os == 'ubuntu-latest'
         with:
-          name: linux-64
+          name: linux-x64
           path: builds/${{ matrix.config.os }}/shmfmi-server/libsharedmemory.so
 
       - uses: actions/upload-artifact@v2
         if: matrix.config.os == 'ubuntu-latest'
         with:
-          name: linux-64
+          name: linux-x64
           path: builds/${{ matrix.config.os }}/libshmfmu/liblibshmfmu.so
 
       - uses: actions/upload-artifact@v2
         if: matrix.config.os == 'macos-latest'
         with:
-          name: macos-64
+          name: macos-x64
           path: builds/${{ matrix.config.os }}/shmfmi-server/libsharedmemory.dylib
 
       - uses: actions/upload-artifact@v2
         if: matrix.config.os == 'macos-latest'
         with:
-          name: macos-64
+          name: macos-x64
           path: builds/${{ matrix.config.os }}/libshmfmu/liblibshmfmu.dylib
diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml
@@ -16,6 +16,16 @@ jobs:
       - name: "Build windows x64"
         run: ./scripts/compile-win64.sh
 
+      - uses: actions/upload-artifact@v2
+        with:
+          name: win-x64
+          path: builds/winx64/shmfmi-server/sharedmemory.dll
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: win-x64
+          path: builds/winx64/libshmfmu/libshmfmu.dll
+
   compileWindowsx32:
     runs-on: ubuntu-latest
 
@@ -27,6 +37,16 @@ jobs:
       - name: "Build windows x86"
         run: ./scripts/compile-win32.sh
 
+      - uses: actions/upload-artifact@v2
+        with:
+          name: win-x32
+          path: builds/winx32/shmfmi-server/sharedmemory.dll
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: win-x32
+          path: builds/winx32/libshmfmu/libshmfmu.dll
+
   compileLinuxx32:
     runs-on: ubuntu-latest
 
@@ -37,6 +57,16 @@ jobs:
       - name: "Build linux x32"
         run: ./scripts/compile-linux32.sh
 
+      - uses: actions/upload-artifact@v2
+        with:
+          name: linux-x32
+          path: builds/linux-x32/shmfmi-server/libsharedmemory.so
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: linux-x32
+          path: builds/linux-x32/libshmfmu/liblibshmfmu.so
+
 #  compileLinuxx64:
 #    runs-on: ubuntu-latest
 #
@@ -46,6 +76,15 @@ jobs:
 #          submodules: 'true'
 #      - name: "Build linux x64"
 #        run: ./scripts/compile-linux64.sh
+#      - uses: actions/upload-artifact@v2
+#        with:
+#          name: linux-x64
+#          path: builds/linux-x64/shmfmi-server/libsharedmemory.so
+#
+#      - uses: actions/upload-artifact@v2
+#        with:
+#          name: linux-x64
+#          path: builds/linux-x64/libshmfmu/liblibshmfmu.so
 
 #  compileMacOSXx64:
 #    runs-on: ubuntu-latest
@@ -55,4 +94,13 @@ jobs:
 #        with:
 #          submodules: 'true'
 #      - name: "Build MacOSX x64"
-#        run: ./scripts/compile-mac.sh
+#        run: ./scripts/compile-mac.sh
+#      - uses: actions/upload-artifact@v2
+#        with:
+#          name: macos-x64
+#          path: builds/mac/shmfmi-server/libsharedmemory.dylib
+#
+#      - uses: actions/upload-artifact@v2
+#        with:
+#          name: macos-x64
+#          path: builds/mac/libshmfmu/liblibshmfmu.dylib