Add SDL2 symlink instead of copying it

Use new variable to create SDL2 symlink Get full history of file structure
DeBlister · May 30, 2022 · ded5c89 · ded5c89
1 parent fc3fa88
commit ded5c89
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -465,6 +465,7 @@ jobs:
       ENGINE: ES_Engine
       ES_BINARY: Endless Sky
       SDL2_FRAMEWORK: build/SDL2.framework
+      SDL2_NAME: SDL2.framework
     steps:
     - uses: actions/checkout@v2
     - name: Update Homebrew
@@ -480,6 +481,8 @@ jobs:
         key: ${{ matrix.os }}-sdl2-${{ hashFiles('.github/workflows/ci.yml', 'EndlessSky.xcodeproj/**', 'utils/set_dylibs_rpath.sh', 'utils/fetch_sdl2_framework.sh') }}
     - name: Create empty app structure
       run: |
+        echo "Build directory structure" && tree -L 3 build
+        echo "Tree before creating directories (should fail but we'll see)" && tree -L 5 Contents || ls -l
         mkdir -p Contents/Frameworks/${{ env.ENGINE }}.framework/Versions/A/Frameworks Contents/MacOS Contents/Resources
         echo "Tree after creating directories" && tree -L 4 Contents/Frameworks
     - name: Download engine binary
@@ -497,14 +500,15 @@ jobs:
         ln -s /usr/local/opt/libpng/lib/libpng16.dylib Contents/Frameworks/${{ env.ENGINE }}.framework/Versions/A/Frameworks/
         ln -s /usr/local/opt/jpeg-turbo/lib/libturbojpeg.0.dylib Contents/Frameworks/${{ env.ENGINE }}.framework/Versions/A/Frameworks/
         echo "Tree after adding lib-type symlinks" && tree -L 4 Contents/Frameworks
-        mv ${SDL2_FRAMEWORK} Contents/Frameworks/${{ env.ENGINE }}.framework/Versions/A/Frameworks
+        mv ${{ env.SDL2_FRAMEWORK }} Contents/Frameworks/${{ env.ENGINE }}.framework/Versions/A/Frameworks
+        ln -s ${{ env.ENGINE }}.framework/Versions/A/Frameworks/${{ env.SDL2_NAME }} Contents/Frameworks
         cd Contents/Resources/
         ln -s ../../data
         ln -s ../../images
         ln -s ../../sounds
         cd ../..
     - name: Check frameworks folders
-      run: echo "Tree after all supporting setup" tree -L 4 Contents/Frameworks
+      run: echo "Tree after all supporting setup" && tree -L 4 Contents/Frameworks
     - name: Download game binary
       uses: actions/download-artifact@v2
       with: