From 96291056f7589cf90650c6c1078049d5ee21bca3 Mon Sep 17 00:00:00 2001 From: Trivernis Date: Fri, 5 Nov 2021 08:54:25 +0100 Subject: [PATCH 01/10] Add build debug workflow Signed-off-by: Trivernis --- .../.github/workflows/build-debug-build.yml | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 mediarepo-ui/.github/workflows/build-debug-build.yml diff --git a/mediarepo-ui/.github/workflows/build-debug-build.yml b/mediarepo-ui/.github/workflows/build-debug-build.yml new file mode 100644 index 0000000..7125a5c --- /dev/null +++ b/mediarepo-ui/.github/workflows/build-debug-build.yml @@ -0,0 +1,44 @@ +name: Build Debug Build + +on: + workflow_dispatch: + push: + branches: + - main + - github-actions + +jobs: + build: + + runs-on: ${{ matrix.os }} + + strategy: + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] + + steps: + - uses: actions/checkout@v2 + + - name: Use Node.js 16 + uses: actions/setup-node@v1 + with: + node-version: 16 + + - name: Install Tauri + run: cargo install tauri-cli --version ^1.0.0-beta + + - name: Install dependencies + uses: borales/actions-yarn@v2.3.0 + with: + cmd: build + + - name: Build project + run: cargo tauri build --debug + + - name: Upload artifacts + uses: actions/upload-artifact@v2 + with: + name: mediarepo-ui-{{ matrix.os }} + path: | + src-tauri/release/bundle/* + src-tauri/release/mediarepo-ui* \ No newline at end of file From f5c2a53197214c818a3956d79230dc2e81e41930 Mon Sep 17 00:00:00 2001 From: Trivernis Date: Fri, 5 Nov 2021 08:55:53 +0100 Subject: [PATCH 02/10] Fix workflow syntax errors Signed-off-by: Trivernis --- .../.github/workflows/build-debug-build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mediarepo-ui/.github/workflows/build-debug-build.yml b/mediarepo-ui/.github/workflows/build-debug-build.yml index 7125a5c..509422a 100644 --- a/mediarepo-ui/.github/workflows/build-debug-build.yml +++ b/mediarepo-ui/.github/workflows/build-debug-build.yml @@ -29,16 +29,16 @@ jobs: - name: Install dependencies uses: borales/actions-yarn@v2.3.0 - with: - cmd: build + with: + cmd: build - name: Build project run: cargo tauri build --debug - name: Upload artifacts - uses: actions/upload-artifact@v2 - with: - name: mediarepo-ui-{{ matrix.os }} - path: | - src-tauri/release/bundle/* - src-tauri/release/mediarepo-ui* \ No newline at end of file + uses: actions/upload-artifact@v2 + with: + name: mediarepo-ui-{{ matrix.os }} + path: | + src-tauri/release/bundle/* + src-tauri/release/mediarepo-ui* \ No newline at end of file From 4276598e62d2e8ca542530d930f53ef8a2b038eb Mon Sep 17 00:00:00 2001 From: Trivernis Date: Fri, 5 Nov 2021 09:08:12 +0100 Subject: [PATCH 03/10] Add caching and installation of angular cli Signed-off-by: Trivernis --- .../.github/workflows/build-debug-build.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mediarepo-ui/.github/workflows/build-debug-build.yml b/mediarepo-ui/.github/workflows/build-debug-build.yml index 509422a..7aa9804 100644 --- a/mediarepo-ui/.github/workflows/build-debug-build.yml +++ b/mediarepo-ui/.github/workflows/build-debug-build.yml @@ -19,6 +19,18 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Cache Dependencies + id: cache-dependencies + uses: actions/cache@v2 + with: + path: | + node_modules + src-tauri/target + ~/.cargo + key: ${{ runner.os }}-dependencies-${{ hashFiles('src-tauri/Cargo.lock') }}-${{ hashFiles('yarn.lock') }} + restore_keys: | + ${{ runner.os }}-dependencies- + - name: Use Node.js 16 uses: actions/setup-node@v1 with: @@ -27,6 +39,9 @@ jobs: - name: Install Tauri run: cargo install tauri-cli --version ^1.0.0-beta + - name: Install Angular CLI + run: npm install -g @angular/cli + - name: Install dependencies uses: borales/actions-yarn@v2.3.0 with: From b9226d315fa77ee81ea7622b30e0f0fb012a593d Mon Sep 17 00:00:00 2001 From: Trivernis Date: Fri, 5 Nov 2021 09:15:55 +0100 Subject: [PATCH 04/10] Add yarn installation command Signed-off-by: Trivernis --- mediarepo-ui/.github/workflows/build-debug-build.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mediarepo-ui/.github/workflows/build-debug-build.yml b/mediarepo-ui/.github/workflows/build-debug-build.yml index 7aa9804..878f237 100644 --- a/mediarepo-ui/.github/workflows/build-debug-build.yml +++ b/mediarepo-ui/.github/workflows/build-debug-build.yml @@ -15,6 +15,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] + fail-fast: false steps: - uses: actions/checkout@v2 @@ -42,10 +43,11 @@ jobs: - name: Install Angular CLI run: npm install -g @angular/cli + - name: Install yarn + run: npm install -g yarn + - name: Install dependencies - uses: borales/actions-yarn@v2.3.0 - with: - cmd: build + run: yarn install - name: Build project run: cargo tauri build --debug From b38ae8dc67f3aa017ede1444d5d0077ea993cdba Mon Sep 17 00:00:00 2001 From: Trivernis Date: Fri, 5 Nov 2021 09:16:44 +0100 Subject: [PATCH 05/10] Fix fail-fast parameter Signed-off-by: Trivernis --- mediarepo-ui/.github/workflows/build-debug-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediarepo-ui/.github/workflows/build-debug-build.yml b/mediarepo-ui/.github/workflows/build-debug-build.yml index 878f237..3d3e349 100644 --- a/mediarepo-ui/.github/workflows/build-debug-build.yml +++ b/mediarepo-ui/.github/workflows/build-debug-build.yml @@ -13,9 +13,9 @@ jobs: runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - fail-fast: false steps: - uses: actions/checkout@v2 From 75acaa8fe8f46600a5f94aab7df99072bd307179 Mon Sep 17 00:00:00 2001 From: Trivernis Date: Fri, 5 Nov 2021 13:01:41 +0100 Subject: [PATCH 06/10] Add additional setup command for linux Signed-off-by: Trivernis --- mediarepo-ui/.github/workflows/build-debug-build.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mediarepo-ui/.github/workflows/build-debug-build.yml b/mediarepo-ui/.github/workflows/build-debug-build.yml index 3d3e349..843faf9 100644 --- a/mediarepo-ui/.github/workflows/build-debug-build.yml +++ b/mediarepo-ui/.github/workflows/build-debug-build.yml @@ -29,7 +29,7 @@ jobs: src-tauri/target ~/.cargo key: ${{ runner.os }}-dependencies-${{ hashFiles('src-tauri/Cargo.lock') }}-${{ hashFiles('yarn.lock') }} - restore_keys: | + restore-keys: | ${{ runner.os }}-dependencies- - name: Use Node.js 16 @@ -49,6 +49,13 @@ jobs: - name: Install dependencies run: yarn install + - name: Install OS-specific dependencies + uses: knicknic/os-specific-run@v1.0.3 + with: + linux: | + sudo apt update + sudo apt install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libappindicator3-dev patchelf librsvg2-dev -y + - name: Build project run: cargo tauri build --debug From 74c8238f2695586eb235c83fb91c7b0b9a557ca6 Mon Sep 17 00:00:00 2001 From: Trivernis Date: Fri, 5 Nov 2021 16:21:24 +0100 Subject: [PATCH 07/10] Fix artifact path and remove unnecessary os dependencies Signed-off-by: Trivernis --- mediarepo-ui/.github/workflows/build-debug-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mediarepo-ui/.github/workflows/build-debug-build.yml b/mediarepo-ui/.github/workflows/build-debug-build.yml index 843faf9..e085069 100644 --- a/mediarepo-ui/.github/workflows/build-debug-build.yml +++ b/mediarepo-ui/.github/workflows/build-debug-build.yml @@ -54,7 +54,7 @@ jobs: with: linux: | sudo apt update - sudo apt install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libappindicator3-dev patchelf librsvg2-dev -y + sudo apt install libwebkit2gtk-4.0-dev libgtk-3-dev libappindicator3-dev -y - name: Build project run: cargo tauri build --debug @@ -64,5 +64,5 @@ jobs: with: name: mediarepo-ui-{{ matrix.os }} path: | - src-tauri/release/bundle/* - src-tauri/release/mediarepo-ui* \ No newline at end of file + src-tauri/target/release/bundle/* + src-tauri/target/release/mediarepo-ui* \ No newline at end of file From e6693f026fb4ea4caf6c16a58737d01ab4214885 Mon Sep 17 00:00:00 2001 From: Trivernis Date: Fri, 5 Nov 2021 16:28:51 +0100 Subject: [PATCH 08/10] Change path for debug builds one last time Signed-off-by: Trivernis --- mediarepo-ui/.github/workflows/build-debug-build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mediarepo-ui/.github/workflows/build-debug-build.yml b/mediarepo-ui/.github/workflows/build-debug-build.yml index e085069..94d1289 100644 --- a/mediarepo-ui/.github/workflows/build-debug-build.yml +++ b/mediarepo-ui/.github/workflows/build-debug-build.yml @@ -27,6 +27,7 @@ jobs: path: | node_modules src-tauri/target + /home/runner/.cargo/bin ~/.cargo key: ${{ runner.os }}-dependencies-${{ hashFiles('src-tauri/Cargo.lock') }}-${{ hashFiles('yarn.lock') }} restore-keys: | @@ -64,5 +65,5 @@ jobs: with: name: mediarepo-ui-{{ matrix.os }} path: | - src-tauri/target/release/bundle/* - src-tauri/target/release/mediarepo-ui* \ No newline at end of file + src-tauri/target/debug/bundle + src-tauri/target/debug/mediarepo-ui* \ No newline at end of file From a9e404e7d7ddd57d1cc1bbe5a5173b6440501c42 Mon Sep 17 00:00:00 2001 From: Trivernis Date: Fri, 5 Nov 2021 16:59:43 +0100 Subject: [PATCH 09/10] Add release build task Signed-off-by: Trivernis --- .../.github/workflows/build-debug-build.yml | 69 --------- mediarepo-ui/.github/workflows/build.yml | 131 ++++++++++++++++++ 2 files changed, 131 insertions(+), 69 deletions(-) delete mode 100644 mediarepo-ui/.github/workflows/build-debug-build.yml create mode 100644 mediarepo-ui/.github/workflows/build.yml diff --git a/mediarepo-ui/.github/workflows/build-debug-build.yml b/mediarepo-ui/.github/workflows/build-debug-build.yml deleted file mode 100644 index 94d1289..0000000 --- a/mediarepo-ui/.github/workflows/build-debug-build.yml +++ /dev/null @@ -1,69 +0,0 @@ -name: Build Debug Build - -on: - workflow_dispatch: - push: - branches: - - main - - github-actions - -jobs: - build: - - runs-on: ${{ matrix.os }} - - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest, macos-latest, windows-latest] - - steps: - - uses: actions/checkout@v2 - - - name: Cache Dependencies - id: cache-dependencies - uses: actions/cache@v2 - with: - path: | - node_modules - src-tauri/target - /home/runner/.cargo/bin - ~/.cargo - key: ${{ runner.os }}-dependencies-${{ hashFiles('src-tauri/Cargo.lock') }}-${{ hashFiles('yarn.lock') }} - restore-keys: | - ${{ runner.os }}-dependencies- - - - name: Use Node.js 16 - uses: actions/setup-node@v1 - with: - node-version: 16 - - - name: Install Tauri - run: cargo install tauri-cli --version ^1.0.0-beta - - - name: Install Angular CLI - run: npm install -g @angular/cli - - - name: Install yarn - run: npm install -g yarn - - - name: Install dependencies - run: yarn install - - - name: Install OS-specific dependencies - uses: knicknic/os-specific-run@v1.0.3 - with: - linux: | - sudo apt update - sudo apt install libwebkit2gtk-4.0-dev libgtk-3-dev libappindicator3-dev -y - - - name: Build project - run: cargo tauri build --debug - - - name: Upload artifacts - uses: actions/upload-artifact@v2 - with: - name: mediarepo-ui-{{ matrix.os }} - path: | - src-tauri/target/debug/bundle - src-tauri/target/debug/mediarepo-ui* \ No newline at end of file diff --git a/mediarepo-ui/.github/workflows/build.yml b/mediarepo-ui/.github/workflows/build.yml new file mode 100644 index 0000000..7eb0879 --- /dev/null +++ b/mediarepo-ui/.github/workflows/build.yml @@ -0,0 +1,131 @@ +name: Build + +on: + workflow_dispatch: + push: + branches: + - main + - github-actions + +jobs: + build-debug: + + runs-on: ${{ matrix.os }} + + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] + + steps: + - uses: actions/checkout@v2 + + - name: Cache Dependencies + id: cache-dependencies + uses: actions/cache@v2 + with: + path: | + node_modules + src-tauri/target/**/deps + /home/runner/.cargo/bin + ~/.cargo + key: ${{ runner.os }}-dependencies-${{ hashFiles('src-tauri/Cargo.lock') }}-${{ hashFiles('yarn.lock') }} + restore-keys: | + ${{ runner.os }}-dependencies- + ${{ runner.os }}-release-dependencies- + + - name: Use Node.js 16 + uses: actions/setup-node@v1 + with: + node-version: 16 + + - name: Install Tauri + run: cargo install tauri-cli --version ^1.0.0-beta + + - name: Install Angular CLI + run: npm install -g @angular/cli + + - name: Install yarn + run: npm install -g yarn + + - name: Install dependencies + run: yarn install + + - name: Install OS-specific dependencies + uses: knicknic/os-specific-run@v1.0.3 + with: + linux: | + sudo apt update + sudo apt install libwebkit2gtk-4.0-dev libgtk-3-dev libappindicator3-dev -y + + - name: Build project + run: cargo tauri build --debug + + - name: Upload artifacts + uses: actions/upload-artifact@v2 + with: + name: mediarepo-ui-${{ runner.os }}-debug + path: | + src-tauri/target/debug/bundle + src-tauri/target/debug/mediarepo-ui* + + build-release: + + runs-on: ${{ matrix.os }} + + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] + + steps: + - uses: actions/checkout@v2 + + - name: Cache Dependencies + id: cache-dependencies + uses: actions/cache@v2 + with: + path: | + node_modules + src-tauri/target + /home/runner/.cargo/bin + ~/.cargo + key: ${{ runner.os }}-release-dependencies-${{ hashFiles('src-tauri/Cargo.lock') }}-${{ hashFiles('yarn.lock') }} + restore-keys: | + ${{ runner.os }}-release-dependencies- + ${{ runner.os }}-dependencies- + + - name: Use Node.js 16 + uses: actions/setup-node@v1 + with: + node-version: 16 + + - name: Install Tauri + run: cargo install tauri-cli --version ^1.0.0-beta + + - name: Install Angular CLI + run: npm install -g @angular/cli + + - name: Install yarn + run: npm install -g yarn + + - name: Install dependencies + run: yarn install + + - name: Install OS-specific dependencies + uses: knicknic/os-specific-run@v1.0.3 + with: + linux: | + sudo apt update + sudo apt install libwebkit2gtk-4.0-dev libgtk-3-dev libappindicator3-dev -y + + - name: Build project + run: cargo tauri build + + - name: Upload artifacts + uses: actions/upload-artifact@v2 + with: + name: mediarepo-ui-${{ runner.os }}-release + path: | + src-tauri/target/release/bundle + src-tauri/target/release/mediarepo-ui* \ No newline at end of file From 3a2f24068991a345d26cff961c1164b8f4625149 Mon Sep 17 00:00:00 2001 From: Trivernis Date: Fri, 5 Nov 2021 17:02:05 +0100 Subject: [PATCH 10/10] Fix cargo caching path Signed-off-by: Trivernis --- mediarepo-ui/.github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediarepo-ui/.github/workflows/build.yml b/mediarepo-ui/.github/workflows/build.yml index 7eb0879..73a3f76 100644 --- a/mediarepo-ui/.github/workflows/build.yml +++ b/mediarepo-ui/.github/workflows/build.yml @@ -88,7 +88,7 @@ jobs: path: | node_modules src-tauri/target - /home/runner/.cargo/bin + /home/runner/.cargo ~/.cargo key: ${{ runner.os }}-release-dependencies-${{ hashFiles('src-tauri/Cargo.lock') }}-${{ hashFiles('yarn.lock') }} restore-keys: |