chore: sync make build with dev (#5847)
* chore: sync up make build with dev * ci: update macOS self-hosted runner
This commit is contained in:
parent
9ea081576b
commit
af892428a5
2
.github/workflows/jan-linter-and-test.yml
vendored
2
.github/workflows/jan-linter-and-test.yml
vendored
@ -71,7 +71,7 @@ jobs:
|
|||||||
path: coverage/lcov.info
|
path: coverage/lcov.info
|
||||||
|
|
||||||
test-on-macos:
|
test-on-macos:
|
||||||
runs-on: ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) && 'macos-latest' || 'macos-selfhosted-12-arm64' }}
|
runs-on: ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) && 'macos-latest' || 'macos-selfhosted-15-arm64' }}
|
||||||
if: github.event_name == 'pull_request' || github.event_name == 'push' || github.event_name == 'workflow_dispatch'
|
if: github.event_name == 'pull_request' || github.event_name == 'push' || github.event_name == 'workflow_dispatch'
|
||||||
steps:
|
steps:
|
||||||
- name: Getting the repo
|
- name: Getting the repo
|
||||||
|
|||||||
@ -141,7 +141,7 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
- name: Build app
|
- name: Build app
|
||||||
run: |
|
run: |
|
||||||
make build-tauri
|
make build
|
||||||
|
|
||||||
APP_IMAGE=./src-tauri/target/release/bundle/appimage/$(ls ./src-tauri/target/release/bundle/appimage/ | grep AppImage | head -1)
|
APP_IMAGE=./src-tauri/target/release/bundle/appimage/$(ls ./src-tauri/target/release/bundle/appimage/ | grep AppImage | head -1)
|
||||||
yarn tauri signer sign \
|
yarn tauri signer sign \
|
||||||
|
|||||||
@ -168,7 +168,7 @@ jobs:
|
|||||||
- name: Build app
|
- name: Build app
|
||||||
run: |
|
run: |
|
||||||
rustup target add x86_64-apple-darwin
|
rustup target add x86_64-apple-darwin
|
||||||
make build-tauri
|
make build
|
||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
APP_PATH: '.'
|
APP_PATH: '.'
|
||||||
|
|||||||
@ -178,7 +178,7 @@ jobs:
|
|||||||
- name: Build app
|
- name: Build app
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
make build-tauri
|
make build
|
||||||
env:
|
env:
|
||||||
AZURE_KEY_VAULT_URI: ${{ secrets.AZURE_KEY_VAULT_URI }}
|
AZURE_KEY_VAULT_URI: ${{ secrets.AZURE_KEY_VAULT_URI }}
|
||||||
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
|
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
|
||||||
|
|||||||
5
Makefile
5
Makefile
@ -56,11 +56,6 @@ build: install-and-build
|
|||||||
yarn download:lib
|
yarn download:lib
|
||||||
yarn build
|
yarn build
|
||||||
|
|
||||||
# Deprecated soon
|
|
||||||
build-tauri: install-and-build
|
|
||||||
yarn download:lib
|
|
||||||
yarn build
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
ifeq ($(OS),Windows_NT)
|
ifeq ($(OS),Windows_NT)
|
||||||
-powershell -Command "Get-ChildItem -Path . -Include node_modules, .next, dist, build, out, .turbo, .yarn -Recurse -Directory | Remove-Item -Recurse -Force"
|
-powershell -Command "Get-ChildItem -Path . -Include node_modules, .next, dist, build, out, .turbo, .yarn -Recurse -Directory | Remove-Item -Recurse -Force"
|
||||||
|
|||||||
@ -73,12 +73,8 @@ run = [
|
|||||||
[tasks.build]
|
[tasks.build]
|
||||||
description = "Build complete application (matches Makefile)"
|
description = "Build complete application (matches Makefile)"
|
||||||
depends = ["install-and-build"]
|
depends = ["install-and-build"]
|
||||||
run = "yarn build"
|
|
||||||
|
|
||||||
[tasks.build-tauri]
|
|
||||||
description = "Build Tauri application (DEPRECATED - matches Makefile)"
|
|
||||||
depends = ["install-and-build"]
|
|
||||||
run = [
|
run = [
|
||||||
|
"yarn copy:lib",
|
||||||
"yarn build"
|
"yarn build"
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user