Merge pull request #101 from omochi/tar-install

tarを展開するときにそのままインストールする
omochi · May 10, 2024 · e0d5ff7 · e0d5ff7
2 parents 8e80e05 + 36aff62
commit e0d5ff7
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -44,24 +44,24 @@ jobs:
           curl
           binaryen
 
-      - run: curl -L -O https://download.swift.org/development/ubuntu2204/${{ env.SWIFT }}/${{ env.SWIFT }}-ubuntu22.04.tar.gz
+      - run: curl -LO https://download.swift.org/development/ubuntu2204/${{ env.SWIFT }}/${{ env.SWIFT }}-ubuntu22.04.tar.gz
         working-directory: /home/runner
-      - run: tar xzf ${{ env.SWIFT }}-ubuntu22.04.tar.gz
+      - run: sudo tar -xf ${{ env.SWIFT }}-ubuntu22.04.tar.gz --strip-components=2 -C /usr/local
         working-directory: /home/runner
-      - run: echo /home/runner/${{ env.SWIFT }}-ubuntu22.04/usr/bin >> ${GITHUB_PATH}
       - run: swift --version
+
       - run: >
           swift sdk install
           https://github.com/swiftwasm/swift/releases/download/${{ env.SWIFT_WASM }}/${{ env.SWIFT_WASM }}-wasm32-unknown-wasi.artifactbundle.zip
-      - run: curl -L -O https://github.com/omochi/carton-build/releases/download/snapshot-2024-04-16/carton.tar.gz
+      - run: swift sdk list
+
+      - run: curl -LO https://github.com/omochi/carton-build/releases/download/snapshot-2024-04-16/carton.tar.gz
         working-directory: /home/runner
-      - run: tar xzf carton.tar.gz
+      - run: sudo tar -xf carton.tar.gz --strip-components=1 -C /usr/local/bin
         working-directory: /home/runner
-      - run: echo /home/runner/carton >> ${GITHUB_PATH}
       - run: carton --version
 
       - run: swift package resolve
-
       - run: swift build --build-tests
       - run: swift test