daydream

commit ab01442c62bdc940441790b5f2e2949baedfd85a
parent 0929fff9044e4ca44927ae4f71191f570d91f18f
Author: Marcel <mtrnord1@gmail.com>
Date:   Sat, 25 Jul 2020 04:16:56 +0200

Update CI and fix worker build

Took 6 minutes

Diffstat:
M
.github/workflows/deploy.yml
 | 
11
+----------
M
Cargo.lock
 | 
8
+-------
M
Makefile.toml
 | 
4
++--

3 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -32,17 +32,8 @@ jobs:
       - name: Install gettext
         run: sudo apt-get update && sudo apt-get install -y gettext
 
-      - name: Install xtr
-        run: cargo install xtr
-
-      - name: Install cargo-i18n
-        run: cargo install cargo-i18n
-
-      - name: Regenerate translation files
-        run: cargo i18n || exit 0
-
       - name: Build
-        run: source emsdk-master/emsdk_env.sh && yarn run build
+        run: source emsdk-master/emsdk_env.sh && cargo make dist
 
       #- name: Publish
       #  uses: netlify/actions/cli@master
diff --git a/Cargo.lock b/Cargo.lock
@@ -1173,8 +1173,7 @@ dependencies = [
 [[package]]
 name = "reqwest"
 version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12427a5577082c24419c9c417db35cfeb65962efc7675bb6b0d5f1f9d315bfe6"
+source = "git+https://github.com/daydream-mx/reqwest.git?branch=MTRNord/wasm-worker-support#3cfec388702b239ba0daf41dc48a4fee775ce43a"
 dependencies = [
  "base64",
  "bytes",
@@ -2087,8 +2086,3 @@ source = "git+https://github.com/engineerd/cjson#ccb9a6336f8279d35561a6ec189aa7e
 name = "olm-sys"
 version = "0.1.5"
 source = "git+https://gitlab.gnome.org/stoically/olm-sys?branch=wasm-target#19e18932a122dca32ead57660711327126c78432"
-
-[[patch.unused]]
-name = "reqwest"
-version = "0.10.6"
-source = "git+https://github.com/daydream-mx/reqwest.git?branch=MTRNord/wasm-worker-support#0f7c15c8531028b39f7af7a4aab0ee9a0c02695a"
diff --git a/Makefile.toml b/Makefile.toml
@@ -16,11 +16,11 @@ rm ./dist
 
 [tasks.dist]
 # TODO add scss task when it works
-dependencies = ["format", "wasm-clean", "scss", "pure-build-app", "wasm-build", "pure-build-worker", "wasm-build-worker", "copy-files"]
+dependencies = ["format", "wasm-clean", "update-translations", "scss", "pure-build-app", "wasm-build", "pure-build-worker", "wasm-build-worker", "copy-files"]
 
 [tasks.dist-debug]
 # TODO add scss task when it works
-dependencies = ["format", "wasm-clean", "scss", "pure-build-app-debug", "wasm-build-debug", "pure-build-worker-debug", "wasm-build-worker-debug", "copy-files"]
+dependencies = ["format", "wasm-clean", "update-translations", "scss", "pure-build-app-debug", "wasm-build-debug", "pure-build-worker-debug", "wasm-build-worker-debug", "copy-files"]
 
 [tasks.run]
 watch = {watch = ["./src", "./static", "./startup_helper"], poll = true}