Use working-directory to tar files

kremi151 · Jun 6, 2021 · f844d65 · f844d65
1 parent 714c2ca
commit f844d65
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/.github/workflows/build-sdl.yml b/.github/workflows/build-sdl.yml
@@ -44,13 +44,15 @@ jobs:
           cmakeBuildType: Release
       - name: Pack Linux binary and libraries
         run: |
-          cp $(cmake ./platform-sdl/ -L | grep SDL2_LIBRARY | cut -d= -f 2 | cut -d';' -f 1) "${{ github.workspace }}/platform-sdl/cmake-build/"
-          tar -cvf "${{ github.workspace }}/platform-sdl/cmake-build/fb_sdl.tar" -C "${{ github.workspace }}/platform-sdl/cmake-build" "${{ github.workspace }}/platform-sdl/cmake-build/fb_sdl" ${{ github.workspace }}/platform-sdl/cmake-build/*.so
+          cp $(cmake "${{ github.workspace }}/platform-sdl" -L | grep SDL2_LIBRARY | cut -d= -f 2 | cut -d';' -f 1) "${{ github.workspace }}/platform-sdl/cmake-build/"
+          tar -cvf fb_sdl.tar ./fb_sdl" ./*.so
+        working-directory: "${{ github.workspace }}/platform-sdl/cmake-build"
         if: ${{ startsWith(matrix.config.os, 'ubuntu-') }}
       - name: Pack macOS app bundle
         run: |
-          ./.github/workflows/scripts/pack-macos-sdl.sh "${{ github.workspace }}/platform-sdl/cmake-build/fb_sdl.app"
-          tar -cvf "${{ github.workspace }}/platform-sdl/cmake-build/fb_sdl.tar" -C "${{ github.workspace }}/platform-sdl/cmake-build" "${{ github.workspace }}/platform-sdl/cmake-build/packed/fb_sdl.app"
+          "${{ github.workspace }}/.github/workflows/scripts/pack-macos-sdl.sh" ./fb_sdl.app
+          tar -cvf fb_sdl.tar -C ./packed ./fb_sdl.app
+        working-directory: "${{ github.workspace }}/platform-sdl/cmake-build"
         if: ${{ startsWith(matrix.config.os, 'macos-') }}
       - name: Upload artifact
         uses: actions/upload-artifact@v2