misc: update to haskell-wasm urls; drop redundant metadata

haskell-wasm · Nov 26, 2024 · 3ed9143 · 3ed9143
1 parent a93e836
commit 3ed9143
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 31 deletions.
diff --git a/.github/actions/darwin-bindist/action.yml b/.github/actions/darwin-bindist/action.yml
@@ -25,7 +25,7 @@ runs:
     - name: setup-ghc-wasm-meta
       shell: bash
       run: |
-        curl https://gitlab.haskell.org/ghc/ghc-wasm-meta/-/raw/master/bootstrap.sh | PREFIX=${{ runner.temp }}/.ghc-wasm SKIP_GHC=1 sh
+        curl https://gitlab.haskell.org/haskell-wasm/ghc-wasm-meta/-/raw/master/bootstrap.sh | PREFIX=${{ runner.temp }}/.ghc-wasm SKIP_GHC=1 sh
         ${{ runner.temp }}/.ghc-wasm/add_to_github_path.sh
 
     - name: configure-ghc

diff --git a/alpine-build.sh b/alpine-build.sh
@@ -51,7 +51,7 @@ cabal install \
 ./boot
 
 cd "$(mktemp -d)"
-curl -f -L --retry 5 https://gitlab.haskell.org/ghc/ghc-wasm-meta/-/raw/master/bootstrap.sh | PREFIX=$PWD SKIP_GHC=1 sh
+curl -f -L --retry 5 https://gitlab.haskell.org/haskell-wasm/ghc-wasm-meta/-/raw/master/bootstrap.sh | PREFIX=$PWD SKIP_GHC=1 sh
 . "$PWD/env"
 cd "$OLDPWD"
 

diff --git a/app/Main.hs b/app/Main.hs
@@ -475,20 +475,6 @@ bindistInfos =
                   pipelineFilter = []
                 }
           },
-      (,)
-        "proot"
-        BindistInfo
-          { dlArgs = rawFileDownloadArgs,
-            src =
-              GitLabArtifact
-                { gitlabDomain = "gitlab.com",
-                  projectId = 9799675,
-                  ref = "master",
-                  jobName = "dist",
-                  artifactPath = "dist/proot",
-                  pipelineFilter = []
-                }
-          },
       (,)
         "cabal"
         BindistInfo

diff --git a/meta.json b/meta.json
@@ -1,9 +1,4 @@
 {
-    "binaryen": {
-        "mirrorUrl": "https://github.com/amesgen/ghc-wasm-bindists/releases/download/20230619T174420/binaryen.zip",
-        "originalUrl": "https://nightly.link/type-dance/binaryen/actions/artifacts/705553138.zip",
-        "sriHash": "sha256-JyhJ94WWyR+xoCRvJ7RAbzh22yV8g6Xetr1DSwJD2fI="
-    },
     "cabal": {
         "mirrorUrl": "https://github.com/haskell-wasm/ghc-wasm-bindists/releases/download/20241104T112309/cabal.tar.xz",
         "originalUrl": "https://gitlab.haskell.org/api/v4/projects/1164/jobs/2019845/artifacts/out/cabal-install-3.14.0.0-x86_64-linux-alpine3_18.tar.xz",
@@ -29,11 +24,6 @@
         "originalUrl": "https://gitlab.haskell.org/api/v4/projects/3214/jobs/1993801/artifacts/",
         "sriHash": "sha256-nppLAzkiVJNEjYAPtFp2bXSblk7Wr30hqKHY8WTL460="
     },
-    "proot": {
-        "mirrorUrl": "https://github.com/amesgen/ghc-wasm-bindists/releases/download/20230619T174420/proot",
-        "originalUrl": "https://gitlab.com/api/v4/projects/9799675/jobs/2370229665/artifacts/dist/proot",
-        "sriHash": "sha256-t/Kt9aIlAAoWT0kFqr7+6+EcTB1b7f9eH+iGbEjdcNI="
-    },
     "wasi-sdk": {
         "mirrorUrl": "https://github.com/haskell-wasm/ghc-wasm-bindists/releases/download/20241116T180537/wasi-sdk.tar.gz",
         "originalUrl": "https://gitlab.haskell.org/api/v4/projects/3212/jobs/2038354/artifacts/dist/wasi-sdk-25.0-x86_64-linux.tar.gz",
@@ -130,10 +120,5 @@
         "mirrorUrl": "https://github.com/haskell-wasm/ghc-wasm-bindists/releases/download/20241124T132802/wasm32-wasi-ghc-unreg.tar.xz",
         "originalUrl": "https://gitlab.haskell.org/api/v4/projects/1/jobs/2046696/artifacts/ghc-x86_64-linux-alpine3_20-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf.tar.xz",
         "sriHash": "sha256-RvtmHRGLhKEjkIDCxMgFd6PkoxTmyKTLKr72LlMsVy0="
-    },
-    "wizer": {
-        "mirrorUrl": "https://github.com/amesgen/ghc-wasm-bindists/releases/download/20240107T201637/wizer.zip",
-        "originalUrl": "https://nightly.link/bytecodealliance/wizer/actions/artifacts/1145823566.zip",
-        "sriHash": "sha256-kt+50gamb4LrvhSSz3lc9T9n0fz5MrZUdhZQpKAxnhk="
     }
 }