Fix the WD

zwilias · Jan 16, 2022 · ec6b836 · ec6b836
1 parent 04e0d00
commit ec6b836
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -58,13 +58,14 @@ jobs:
         run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
         shell: bash
       - run: |
-          7z a elm-json-${{ steps.get_version.outputs.VERSION }}-${{ matrix.target }}.tar target/${{ matrix.target }}/release/elm-json
+          7z a elm-json-${{ steps.get_version.outputs.VERSION }}-${{ matrix.target }}.tar elm-json
           7z a elm-json-${{ steps.get_version.outputs.VERSION }}-${{ matrix.target }}.tar.gz elm-json-${{ steps.get_version.outputs.VERSION }}-${{ matrix.target }}.tar
+        working-directory: target/${{ matrix.target }}/release
       - name: Store binary as artifact
         uses: actions/upload-artifact@v2
         with:
           name: elm-json-${{ matrix.target }}
-          path: elm-json-${{ steps.get_version.outputs.VERSION }}-${{ matrix.target }}.tar.gz
+          path: target/${{ matrix.target }}/release/elm-json-${{ steps.get_version.outputs.VERSION }}-${{ matrix.target }}.tar.gz
 
   build:
     needs: test
@@ -103,13 +104,14 @@ jobs:
         run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
         shell: bash
       - run: |
-          7z a elm-json-${{ steps.get_version.outputs.VERSION }}-${{ matrix.target }}.tar target/${{ matrix.target }}/release/elm-json${{ matrix.ext }}
+          7z a elm-json-${{ steps.get_version.outputs.VERSION }}-${{ matrix.target }}.tar elm-json${{ matrix.ext }}
           7z a elm-json-${{ steps.get_version.outputs.VERSION }}-${{ matrix.target }}.tar.gz elm-json-${{ steps.get_version.outputs.VERSION }}-${{ matrix.target }}.tar
+        working-directory: target/${{ matrix.target }}/release
       - name: Store binary as artifact
         uses: actions/upload-artifact@v2
         with:
           name: elm-json-${{ matrix.target }}
-          path: elm-json-${{ steps.get_version.outputs.VERSION }}-${{ matrix.target }}.tar.gz
+          path: target/${{ matrix.target }}/release/elm-json-${{ steps.get_version.outputs.VERSION }}-${{ matrix.target }}.tar.gz
 
   create_release:
     needs: [build, build_cross]

diff --git a/index.js b/index.js
@@ -13,12 +13,12 @@ module.exports = binwrap({
     dirname: __dirname,
     binaries: ["elm-json"],
     urls: {
-        "darwin-arm64": root + "-aarch64-apple-darwin.zip",
-        "darwin-x64": root + "-x86_64-apple-darwin.zip",
-        "linux-x64": root + "-x86_64-unknown-linux-musl.zip",
-        "linux-arm": root + "-armv7-unknown-linux-musleabihf.zip",
-        "linux-arm64": root + "-armv7-unknown-linux-musleabihf.zip",
-        "win32-x64": root + "-x86_64-pc-windows-msvc.zip",
-        "win32-ia32": root + "-x86_64-pc-windows-msvc.zip"
+        "darwin-arm64": root + "-aarch64-apple-darwin.tar.gz",
+        "darwin-x64": root + "-x86_64-apple-darwin.tar.gz",
+        "linux-x64": root + "-x86_64-unknown-linux-musl.tar.gz",
+        "linux-arm": root + "-armv7-unknown-linux-musleabihf.tar.gz",
+        "linux-arm64": root + "-armv7-unknown-linux-musleabihf.tar.gz",
+        "win32-x64": root + "-x86_64-pc-windows-msvc.tar.gz",
+        "win32-ia32": root + "-x86_64-pc-windows-msvc.tar.gz"
     }
 });