From 922125fb188310461bb990297da4dc7f42a0598b Mon Sep 17 00:00:00 2001 From: itsscb Date: Fri, 23 Aug 2024 15:11:00 +0200 Subject: [PATCH 1/5] Update deploy.yml --- .github/workflows/deploy.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0ff655a..31ca159 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -29,6 +29,9 @@ jobs: with: profile: minimal toolchain: stable + + - name: Add Rust target wasm32-unknown-unknown + run: rustup target add wasm32-unknown-unknown - name: Install Trunk run: cargo install trunk @@ -42,6 +45,7 @@ jobs: run: npm install -g tailwindcss - name: Build Frontend + working-directory: ./frontend run: | trunk build --release From 9d90d9b70c1b709baccc0bf521e293c9e6e6a1f6 Mon Sep 17 00:00:00 2001 From: itsscb Date: Fri, 23 Aug 2024 15:22:52 +0200 Subject: [PATCH 2/5] feat: adds trunk and node to gh action cache --- .github/workflows/deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 31ca159..241e50f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,6 +19,8 @@ jobs: uses: actions/cache@v4 with: path: | + node_modules + ~/.cache/trunk ~/.cargo target/ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} From 7262775a48db65b7c8d0ef94570e275938d751c9 Mon Sep 17 00:00:00 2001 From: itsscb Date: Fri, 23 Aug 2024 15:37:54 +0200 Subject: [PATCH 3/5] feat: adds trunk output to cache & installs tailwindcss locally --- .github/workflows/deploy.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 241e50f..d00cabd 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,6 +19,7 @@ jobs: uses: actions/cache@v4 with: path: | + frontend/dist/ node_modules ~/.cache/trunk ~/.cargo @@ -44,7 +45,8 @@ jobs: node-version: 20 - name: Install Tailwind CSS - run: npm install -g tailwindcss + run: npm install -D tailwindcss + working-directory: ./frontend - name: Build Frontend working-directory: ./frontend From a538204d3b276346a335376fdd5f2e97b3a7e7a3 Mon Sep 17 00:00:00 2001 From: itsscb Date: Fri, 23 Aug 2024 15:40:45 +0200 Subject: [PATCH 4/5] Update deploy.yml --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d00cabd..5d0f28b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,11 +19,11 @@ jobs: uses: actions/cache@v4 with: path: | - frontend/dist/ - node_modules - ~/.cache/trunk ~/.cargo target/ + ~/.cache/trunk + node_modules + frontend/dist/ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} restore-keys: ${{ runner.os }}-cargo-df From b281e8730441a3309a848b0fff4fc52e2f40f39b Mon Sep 17 00:00:00 2001 From: itsscb Date: Fri, 23 Aug 2024 16:24:22 +0200 Subject: [PATCH 5/5] rollback --- .github/workflows/deploy.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5d0f28b..6e4fe31 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,11 +19,10 @@ jobs: uses: actions/cache@v4 with: path: | + node_modules + ~/.cache/trunk ~/.cargo target/ - ~/.cache/trunk - node_modules - frontend/dist/ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} restore-keys: ${{ runner.os }}-cargo-df @@ -45,19 +44,16 @@ jobs: node-version: 20 - name: Install Tailwind CSS - run: npm install -D tailwindcss - working-directory: ./frontend + run: npm install -g tailwindcss - name: Build Frontend working-directory: ./frontend run: | trunk build --release - - name: Build and Test backend run: | cargo build --verbose --release cargo test --verbose - deploy: runs-on: ubuntu-latest needs: build