sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Fix CI

Browse Source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski
2026-03-24 14:58:59 +00:00
parent 8d4921d74d
commit 7f8abddbaf
7 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build_desktop_and_deploy.yaml
+3 -3
View File
@@ -78,7 +78,7 @@ jobs:
strategy: strategy:
matrix: matrix:
arch: [x64, arm64] arch: [x64, arm64]
uses: ./.github/workflows/build_windows.yaml uses: ./.github/workflows/build_desktop_windows.yaml
secrets: inherit # zizmor: ignore[secrets-inherit] secrets: inherit # zizmor: ignore[secrets-inherit]
with: with:
sign: true sign: true
@@ -89,7 +89,7 @@ jobs:
if: github.event_name != 'workflow_dispatch' || inputs.macos if: github.event_name != 'workflow_dispatch' || inputs.macos
needs: prepare needs: prepare
name: macOS name: macOS
uses: ./.github/workflows/build_macos.yaml uses: ./.github/workflows/build_desktop_macos.yaml
secrets: inherit # zizmor: ignore[secrets-inherit] secrets: inherit # zizmor: ignore[secrets-inherit]
with: with:
sign: true sign: true
@@ -104,7 +104,7 @@ jobs:
matrix: matrix:
arch: [amd64, arm64] arch: [amd64, arm64]
sqlcipher: [static] sqlcipher: [static]
uses: ./.github/workflows/build_linux.yaml uses: ./.github/workflows/build_desktop_linux.yaml
with: with:
arch: ${{ matrix.arch }} arch: ${{ matrix.arch }}
sqlcipher: ${{ matrix.sqlcipher }} sqlcipher: ${{ matrix.sqlcipher }}
.github/workflows/build_desktop_and_test.yaml
+6 -5
View File
@@ -20,7 +20,7 @@ jobs:
windows: windows:
needs: fetch needs: fetch
name: Windows name: Windows
uses: ./.github/workflows/build_windows.yaml uses: ./.github/workflows/build_desktop_windows.yaml
strategy: strategy:
matrix: matrix:
arch: [x64, ia32, arm64] arch: [x64, ia32, arm64]
@@ -31,7 +31,7 @@ jobs:
linux: linux:
needs: fetch needs: fetch
name: "Linux (${{ matrix.arch }}) (sqlcipher: ${{ matrix.sqlcipher }})" name: "Linux (${{ matrix.arch }}) (sqlcipher: ${{ matrix.sqlcipher }})"
uses: ./.github/workflows/build_linux.yaml uses: ./.github/workflows/build_desktop_linux.yaml
strategy: strategy:
matrix: matrix:
sqlcipher: [system, static] sqlcipher: [system, static]
@@ -44,7 +44,7 @@ jobs:
macos: macos:
needs: fetch needs: fetch
name: macOS name: macOS
uses: ./.github/workflows/build_macos.yaml uses: ./.github/workflows/build_desktop_macos.yaml
with: with:
blob_report: true blob_report: true
@@ -70,10 +70,11 @@ jobs:
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8 uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
with: with:
pattern: blob-report-* pattern: blob-report-*
path: all-blob-reports path: apps/desktop/all-blob-reports
merge-multiple: true merge-multiple: true
- name: Merge into HTML Report - name: Merge into HTML Report
working-directory: apps/desktop
run: pnpm playwright merge-reports -c ./playwright.config.ts --reporter=html ./all-blob-reports run: pnpm playwright merge-reports -c ./playwright.config.ts --reporter=html ./all-blob-reports
- name: Upload HTML report - name: Upload HTML report
@@ -81,7 +82,7 @@ jobs:
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7 uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
with: with:
name: html-report name: html-report
path: playwright-report path: apps/desktop/playwright-report
retention-days: 14 retention-days: 14
- if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
.github/workflows/build_desktop_linux.yaml
+2 -2
View File
@@ -164,7 +164,7 @@ jobs:
-e SQLCIPHER_BUNDLED \ -e SQLCIPHER_BUNDLED \
-e CI=1 \ -e CI=1 \
$HAK_DOCKER_IMAGE \ $HAK_DOCKER_IMAGE \
pnpm build:native pnpm run build:native
- name: Fix permissions - name: Fix permissions
working-directory: apps/desktop working-directory: apps/desktop
@@ -192,7 +192,7 @@ jobs:
- name: Build App - name: Build App
working-directory: apps/desktop working-directory: apps/desktop
run: pnpm build --publish never $BUILD_ARGS -l $TARGETS run: pnpm run build --publish never $BUILD_ARGS -l $TARGETS
env: env:
VARIANT_PATH: variant.json VARIANT_PATH: variant.json
# Only set for Nightly builds # Only set for Nightly builds
.github/workflows/build_desktop_macos.yaml
+3 -3
View File
@@ -128,14 +128,14 @@ jobs:
- name: Build Natives - name: Build Natives
if: steps.cache.outputs.cache-hit != 'true' if: steps.cache.outputs.cache-hit != 'true'
working-directory: apps/desktop working-directory: apps/desktop
run: pnpm build:native:universal run: pnpm run build:native:universal
# We split these because electron-builder gets upset if we set CSC_LINK even to an empty string # We split these because electron-builder gets upset if we set CSC_LINK even to an empty string
- name: "[Signed] Build App" - name: "[Signed] Build App"
if: inputs.sign != '' if: inputs.sign != ''
working-directory: apps/desktop working-directory: apps/desktop
run: | run: |
pnpm build:universal --publish never -m ${TARGETS} pnpm run build:universal --publish never -m ${TARGETS}
env: env:
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_ID: ${{ secrets.APPLE_ID }}
@@ -160,7 +160,7 @@ jobs:
if: inputs.sign == '' if: inputs.sign == ''
working-directory: apps/desktop working-directory: apps/desktop
run: | run: |
pnpm build:universal --publish never -m ${TARGETS} pnpm run build:universal --publish never -m ${TARGETS}
env: env:
CSC_IDENTITY_AUTO_DISCOVERY: false CSC_IDENTITY_AUTO_DISCOVERY: false
VARIANT_PATH: variant.json VARIANT_PATH: variant.json
.github/workflows/build_desktop_prepare.yaml
+1 -1
View File
@@ -79,7 +79,7 @@ jobs:
pnpm --cwd element-web install --frozen-lockfile pnpm --cwd element-web install --frozen-lockfile
pnpm --cwd element-web run build pnpm --cwd element-web run build
mv element-web/webapp . mv element-web/webapp .
pnpm asar-webapp pnpm run asar-webapp
env: env:
# These must be set for branch-match.sh to get the right branch # These must be set for branch-match.sh to get the right branch
REPOSITORY: ${{ github.repository }} REPOSITORY: ${{ github.repository }}
.github/workflows/build_desktop_windows.yaml
+2 -2
View File
@@ -194,7 +194,7 @@ jobs:
working-directory: apps/desktop working-directory: apps/desktop
run: | run: |
refreshenv refreshenv
pnpm build:native --target $env:TARGET pnpm run build:native --target $env:TARGET
env: env:
TARGET: ${{ steps.config.outputs.target }} TARGET: ${{ steps.config.outputs.target }}
@@ -244,7 +244,7 @@ jobs:
- name: Build App - name: Build App
working-directory: apps/desktop working-directory: apps/desktop
run: pnpm build --publish never $BUILD_ARGS -w $TARGETS run: pnpm run build --publish never $BUILD_ARGS -w $TARGETS
shell: bash shell: bash
env: env:
VARIANT_PATH: variant.json VARIANT_PATH: variant.json
.github/workflows/dockerbuild.yaml
+2 -2
View File
@@ -34,7 +34,7 @@ jobs:
- name: Build test image - name: Build test image
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7 uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
with: with:
file: dockerbuild/Dockerfile file: apps/desktop/dockerbuild/Dockerfile
push: false push: false
load: true load: true
tags: element-desktop-dockerbuild tags: element-desktop-dockerbuild
@@ -65,7 +65,7 @@ jobs:
if: github.event_name != 'pull_request' if: github.event_name != 'pull_request'
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7 uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
with: with:
file: dockerbuild/Dockerfile file: apps/desktop/dockerbuild/Dockerfile
push: true push: true
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}