From 0a6fe79faecda3323bafacef5113cb0e4f559583 Mon Sep 17 00:00:00 2001 From: restitux Date: Thu, 27 Nov 2025 19:55:39 -0700 Subject: [PATCH 01/19] ci test --- .gitlab-ci.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..1e4ed62 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,35 @@ +#stages: +# - build +# - run +# +#variables: +# IMAGE_NAME: "$CI_REGISTRY_IMAGE/diouxs-builder:$CI_COMMIT_SHA" +# +#build-image: +# stage: build +# image: docker:latest +# services: +# - docker:dind +# variables: +# DOCKER_DRIVER: overlay2 +# script: +# - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY" +# - docker build -t "$IMAGE_NAME" . +# - docker push "$IMAGE_NAME" +# only: +# - branches + +stages: + - run + +run: + stage: run + image: rust:latest + script: + - echo "foo" + - echo "bar" + - echo "baz" > foo + artifacts: + paths: + - ./foo + expire_in: 1 week -- 2.52.0 From 940f020542d3467b79fecfa4ea28764c8397cb9a Mon Sep 17 00:00:00 2001 From: restitux Date: Thu, 27 Nov 2025 20:08:03 -0700 Subject: [PATCH 02/19] new ci test --- .gitlab-ci.yml => .gitea/workflows/test.yaml | 23 +++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) rename .gitlab-ci.yml => .gitea/workflows/test.yaml (65%) diff --git a/.gitlab-ci.yml b/.gitea/workflows/test.yaml similarity index 65% rename from .gitlab-ci.yml rename to .gitea/workflows/test.yaml index 1e4ed62..2cc97a0 100644 --- a/.gitlab-ci.yml +++ b/.gitea/workflows/test.yaml @@ -19,17 +19,14 @@ # only: # - branches -stages: - - run +name: Gitea Actions Demo +run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀 +on: [push] -run: - stage: run - image: rust:latest - script: - - echo "foo" - - echo "bar" - - echo "baz" > foo - artifacts: - paths: - - ./foo - expire_in: 1 week +jobs: + TestStage: + runs-on: ubuntu-latest + steps: + - run: echo "foo" + - run: echo "bar" + - run: echo "baz" > foo -- 2.52.0 From d31eb6f9c83f038e0008c1d11e9fa6ca4fa9a7b6 Mon Sep 17 00:00:00 2001 From: restitux Date: Thu, 27 Nov 2025 20:22:04 -0700 Subject: [PATCH 03/19] container time? --- .gitea/workflows/test.yaml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 2cc97a0..dff6d6a 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -19,14 +19,23 @@ # only: # - branches -name: Gitea Actions Demo -run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀 +name: Build dioxus container on: [push] jobs: TestStage: runs-on: ubuntu-latest steps: - - run: echo "foo" - - run: echo "bar" - - run: echo "baz" > foo + - name: Login to gitea docker registry + uses: docker/login-action@v3 + with: + registry: git.ohea.xyz + username: ${{ secrets.CI_REGISTRY_USER }} + password: ${{ secrets.CI_REGISTRY_PASSWORD }} + - name: Build and push dioxus base container + uses: docker/build-push-action@v6 + with: + context: . + file: docker/Dockerfile + push: true + tags: "git.ohea.xyz/mumble/mumbleweb2/dioxus-build:latest" -- 2.52.0 From f8b04838f9bf1965fb96b71d4a1757175c2f3926 Mon Sep 17 00:00:00 2001 From: restitux Date: Thu, 27 Nov 2025 20:25:17 -0700 Subject: [PATCH 04/19] container timev2? --- .gitea/workflows/test.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index dff6d6a..9fc2cac 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -32,6 +32,8 @@ jobs: registry: git.ohea.xyz username: ${{ secrets.CI_REGISTRY_USER }} password: ${{ secrets.CI_REGISTRY_PASSWORD }} + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 - name: Build and push dioxus base container uses: docker/build-push-action@v6 with: -- 2.52.0 From a9064027fc5040efd5bd9236e2ab6578ad48c791 Mon Sep 17 00:00:00 2001 From: restitux Date: Thu, 27 Nov 2025 20:29:31 -0700 Subject: [PATCH 05/19] container timev3 --- .gitea/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 9fc2cac..eb78587 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -38,6 +38,6 @@ jobs: uses: docker/build-push-action@v6 with: context: . - file: docker/Dockerfile + file: docker/dioxus.Dockerfile push: true tags: "git.ohea.xyz/mumble/mumbleweb2/dioxus-build:latest" -- 2.52.0 From 100d93564ec8c92db26c5c12f2827545e2203c66 Mon Sep 17 00:00:00 2001 From: restitux Date: Thu, 27 Nov 2025 20:30:46 -0700 Subject: [PATCH 06/19] container timev4 --- .gitea/workflows/test.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index eb78587..ee13f89 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -26,6 +26,8 @@ jobs: TestStage: runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@v5 - name: Login to gitea docker registry uses: docker/login-action@v3 with: -- 2.52.0 From adb9aa61246387c24e50a4c82018b1ff14e3dbd9 Mon Sep 17 00:00:00 2001 From: restitux Date: Thu, 27 Nov 2025 20:36:23 -0700 Subject: [PATCH 07/19] container timev5 --- .gitea/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index ee13f89..578299a 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -40,6 +40,6 @@ jobs: uses: docker/build-push-action@v6 with: context: . - file: docker/dioxus.Dockerfile + file: docker/release-builder.Dockerfile push: true tags: "git.ohea.xyz/mumble/mumbleweb2/dioxus-build:latest" -- 2.52.0 From 3da5870bee66392518f726e1d62d0955c7ed7461 Mon Sep 17 00:00:00 2001 From: restitux Date: Thu, 27 Nov 2025 20:43:25 -0700 Subject: [PATCH 08/19] correct container name --- .gitea/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 578299a..b1a4c29 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -42,4 +42,4 @@ jobs: context: . file: docker/release-builder.Dockerfile push: true - tags: "git.ohea.xyz/mumble/mumbleweb2/dioxus-build:latest" + tags: "git.ohea.xyz/mumble/mumble-web2/dioxus-build:latest" -- 2.52.0 From 9b3aa81cf9a6526f323cec676463e8e90e0856b1 Mon Sep 17 00:00:00 2001 From: restitux Date: Thu, 27 Nov 2025 21:04:46 -0700 Subject: [PATCH 09/19] new thing lol --- .gitea/workflows/test.yaml | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index b1a4c29..86f12cc 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -23,23 +23,29 @@ name: Build dioxus container on: [push] jobs: - TestStage: - runs-on: ubuntu-latest + BuildContainer: + runs-on: rust:1.90.0-trixie steps: - name: Checkout uses: actions/checkout@v5 - - name: Login to gitea docker registry - uses: docker/login-action@v3 - with: - registry: git.ohea.xyz - username: ${{ secrets.CI_REGISTRY_USER }} - password: ${{ secrets.CI_REGISTRY_PASSWORD }} + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Build and push dioxus base container - uses: docker/build-push-action@v6 + + - uses: Swatinem/rust-cache@v2 + + - uses: actions-rs/toolchain@v1.0.6 with: - context: . - file: docker/release-builder.Dockerfile - push: true - tags: "git.ohea.xyz/mumble/mumble-web2/dioxus-build:latest" + toolchain: stable + profile: minimal + target: wasm32-unknown-unknown + override: true + + - name: Install cargo binstall + run: curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash + + - name: Install dioxus-cli + run: cargo binstall dioxus-cli --version 0.6.3 + + - name: Build dioxus project + run: dx build --platform web --release -- 2.52.0 From c1209b0aa36fbfc01aa22d5e2c3078677d1e75ca Mon Sep 17 00:00:00 2001 From: restitux Date: Thu, 27 Nov 2025 21:13:31 -0700 Subject: [PATCH 10/19] fuck this shit --- .gitea/workflows/test.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 86f12cc..d28d5f6 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -24,7 +24,9 @@ on: [push] jobs: BuildContainer: - runs-on: rust:1.90.0-trixie + runs-on: ubuntu-latest + container: + image: rust:1.90.0-trixie steps: - name: Checkout uses: actions/checkout@v5 -- 2.52.0 From aab3a05da004909e2110222c088c21341169cdd6 Mon Sep 17 00:00:00 2001 From: restitux Date: Thu, 27 Nov 2025 21:18:43 -0700 Subject: [PATCH 11/19] install nodejs --- .gitea/workflows/test.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index d28d5f6..1d0f3cf 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -28,6 +28,9 @@ jobs: container: image: rust:1.90.0-trixie steps: + - name: Install nodejs + uses: actions/setup-node@v6 + - name: Checkout uses: actions/checkout@v5 -- 2.52.0 From 9cea35c5ae01281685e8eb6af859e46867ceda72 Mon Sep 17 00:00:00 2001 From: restitux Date: Thu, 27 Nov 2025 21:24:32 -0700 Subject: [PATCH 12/19] stupid stupid stupid --- .gitea/workflows/test.yaml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 1d0f3cf..28c2fa5 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -25,26 +25,15 @@ on: [push] jobs: BuildContainer: runs-on: ubuntu-latest - container: - image: rust:1.90.0-trixie steps: - - name: Install nodejs - uses: actions/setup-node@v6 - - name: Checkout uses: actions/checkout@v5 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - uses: Swatinem/rust-cache@v2 - - - uses: actions-rs/toolchain@v1.0.6 + - name: Install rust + uses: dtolnay/rust-toolchain@stable with: toolchain: stable - profile: minimal - target: wasm32-unknown-unknown - override: true + targets: wasm32-unknown-unknown - name: Install cargo binstall run: curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash -- 2.52.0 From d218c9fb54a4ac58394b5531a67a846ca52a32c4 Mon Sep 17 00:00:00 2001 From: restitux Date: Thu, 27 Nov 2025 21:28:15 -0700 Subject: [PATCH 13/19] fix dx build --- .gitea/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 28c2fa5..d6cb3d3 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -42,4 +42,4 @@ jobs: run: cargo binstall dioxus-cli --version 0.6.3 - name: Build dioxus project - run: dx build --platform web --release + run: dx build --platform web --release -p mumble-web2-gui -- 2.52.0 From caea7dcd0a222c9c00d2e2a927cdc2e214dd7abd Mon Sep 17 00:00:00 2001 From: restitux Date: Thu, 27 Nov 2025 21:32:59 -0700 Subject: [PATCH 14/19] rust cache --- .gitea/workflows/test.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index d6cb3d3..19e55e5 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -41,5 +41,7 @@ jobs: - name: Install dioxus-cli run: cargo binstall dioxus-cli --version 0.6.3 + - uses: Swatinem/rust-cache@v2 + - name: Build dioxus project run: dx build --platform web --release -p mumble-web2-gui -- 2.52.0 From c1b88f1ecb4a7355984ec37f5e299d4576cf43ab Mon Sep 17 00:00:00 2001 From: restitux Date: Thu, 27 Nov 2025 21:38:27 -0700 Subject: [PATCH 15/19] cosmetic change --- .gitea/workflows/test.yaml | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 19e55e5..96114bd 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -1,24 +1,3 @@ -#stages: -# - build -# - run -# -#variables: -# IMAGE_NAME: "$CI_REGISTRY_IMAGE/diouxs-builder:$CI_COMMIT_SHA" -# -#build-image: -# stage: build -# image: docker:latest -# services: -# - docker:dind -# variables: -# DOCKER_DRIVER: overlay2 -# script: -# - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY" -# - docker build -t "$IMAGE_NAME" . -# - docker push "$IMAGE_NAME" -# only: -# - branches - name: Build dioxus container on: [push] -- 2.52.0 From 1aabf7551c3c5a1a36748116f1e2abf2bda47468 Mon Sep 17 00:00:00 2001 From: restitux Date: Thu, 27 Nov 2025 21:50:25 -0700 Subject: [PATCH 16/19] add proxy bulid --- .gitea/workflows/test.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 96114bd..34d4cb4 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -24,3 +24,6 @@ jobs: - name: Build dioxus project run: dx build --platform web --release -p mumble-web2-gui + + - name: Build proxy + run: cargo build --release -p mumble-web2-proxy -- 2.52.0 From 9e60d565582d6b89e93fc80ac5f180396f59a0e0 Mon Sep 17 00:00:00 2001 From: restitux Date: Thu, 27 Nov 2025 21:57:39 -0700 Subject: [PATCH 17/19] add proxy artifact --- .gitea/workflows/test.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 34d4cb4..dda1a8e 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -27,3 +27,10 @@ jobs: - name: Build proxy run: cargo build --release -p mumble-web2-proxy + + - name: Upload mumble-web2-proxy Artifact + uses: actions/upload-artifact@v4 + with: + name: mumble-web2-proxy + path: target/release/mumble-web2-proxy + retention-days: 5 -- 2.52.0 From a44376647bf5fb39b44753c61b1188e03d93f474 Mon Sep 17 00:00:00 2001 From: restitux Date: Thu, 27 Nov 2025 22:01:52 -0700 Subject: [PATCH 18/19] fix artifacts --- .gitea/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index dda1a8e..87b8d55 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -29,7 +29,7 @@ jobs: run: cargo build --release -p mumble-web2-proxy - name: Upload mumble-web2-proxy Artifact - uses: actions/upload-artifact@v4 + uses: https://gitea.com/actions/gitea-upload-artifact@v4 with: name: mumble-web2-proxy path: target/release/mumble-web2-proxy -- 2.52.0 From d04d8673cb8266b67582c1ff8d458fa5a3277304 Mon Sep 17 00:00:00 2001 From: restitux Date: Thu, 27 Nov 2025 22:10:47 -0700 Subject: [PATCH 19/19] add gui artifact --- .gitea/workflows/test.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 87b8d55..34774ef 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -25,6 +25,13 @@ jobs: - name: Build dioxus project run: dx build --platform web --release -p mumble-web2-gui + - name: Upload mumble-web2-gui Artifact + uses: https://gitea.com/actions/gitea-upload-artifact@v4 + with: + name: mumble-web2-gui + path: target/dx/mumble-web2-gui/release/web/public + retention-days: 5 + - name: Build proxy run: cargo build --release -p mumble-web2-proxy -- 2.52.0