CringeStudios/sekur-chat
5
0
Fork 0
forked from CringeStudios/element-desktop
Code Pull Requests Actions Activity

Merge branch 't3chguy/build-files-assert' of https://github.com/vector-im/element-desktop into t3chguy/update-electron-builder

Browse Source 
# Conflicts:
#	.github/workflows/build_windows.yaml
This commit is contained in:
Michael Telatynski 2025-02-18 09:44:14 +00:00
commit 0f100b6957
No known key found for this signature in database
GPG Key ID: A2B008A5F49F5D0D
2 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build_and_test.yaml vendored
View File

@ -122,12 +122,6 @@ jobs:
# We need sudo on Linux as it is installed in /opt/ # We need sudo on Linux as it is installed in /opt/
RUN_AS: ${{ runner.os == 'Linux' && 'sudo' || '' }} RUN_AS: ${{ runner.os == 'Linux' && 'sudo' || '' }}
- name: Workaround macOS GHA permission issues
if: runner.os == 'macOS'
run: |
sqlite3 $HOME/Library/Application\ Support/com.apple.TCC/TCC.db "INSERT OR IGNORE INTO access VALUES ('kTCCServiceMicrophone','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159,NULL,NULL,'UNUSED',1687786159);"
sqlite3 $HOME/Library/Application\ Support/com.apple.TCC/TCC.db "INSERT OR IGNORE INTO access VALUES ('kTCCServiceMicrophone','/opt/off/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159,NULL,NULL,'UNUSED',1687786159);"
- name: Run tests - name: Run tests
uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
timeout-minutes: 5 timeout-minutes: 5

47
.github/workflows/build_windows.yaml vendored
View File

@ -37,7 +37,6 @@ jobs:
environment: ${{ inputs.sign && 'packages.element.io' || '' }} environment: ${{ inputs.sign && 'packages.element.io' || '' }}
env: env:
SIGNTOOL_PATH: "C:/Program Files (x86)/Windows Kits/10/bin/10.0.22000.0/x86/signtool.exe" SIGNTOOL_PATH: "C:/Program Files (x86)/Windows Kits/10/bin/10.0.22000.0/x86/signtool.exe"
DEBUG: "electron-builder,electron-windows-sign"
steps: steps:
- uses: nbucic/variable-mapper@0673f6891a0619ba7c002ecfed0f9f4f39017b6f - uses: nbucic/variable-mapper@0673f6891a0619ba7c002ecfed0f9f4f39017b6f
id: config id: config
@ -82,26 +81,26 @@ jobs:
# ActiveTCL package on choco is from 2015, # ActiveTCL package on choco is from 2015,
# this one is newer but includes more than we need # this one is newer but includes more than we need
# - name: Choco install tclsh - name: Choco install tclsh
# if: steps.cache.outputs.cache-hit != 'true' if: steps.cache.outputs.cache-hit != 'true'
# shell: pwsh shell: pwsh
# run: | run: |
# choco install -y magicsplat-tcl-tk --no-progress choco install -y magicsplat-tcl-tk --no-progress
# echo "${HOME}/AppData/Local/Apps/Tcl86/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append echo "${HOME}/AppData/Local/Apps/Tcl86/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
# - name: Choco install NetWide Assembler - name: Choco install NetWide Assembler
# if: steps.cache.outputs.cache-hit != 'true' if: steps.cache.outputs.cache-hit != 'true'
# shell: pwsh shell: pwsh
# run: | run: |
# choco install -y nasm --no-progress choco install -y nasm --no-progress
# echo "C:/Program Files/NASM" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append echo "C:/Program Files/NASM" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
# - name: Install Rust - name: Install Rust
# if: steps.cache.outputs.cache-hit != 'true' if: steps.cache.outputs.cache-hit != 'true'
# run: | run: |
# rustup toolchain install stable --profile minimal --no-self-update rustup toolchain install stable --profile minimal --no-self-update
# rustup default stable rustup default stable
# rustup target add ${{ steps.config.outputs.target }} rustup target add ${{ steps.config.outputs.target }}
- uses: actions/setup-node@v4 - uses: actions/setup-node@v4
with: with:
@ -112,11 +111,11 @@ jobs:
- name: Install Deps - name: Install Deps
run: "yarn install --frozen-lockfile" run: "yarn install --frozen-lockfile"
# - name: Build Natives - name: Build Natives
# if: steps.cache.outputs.cache-hit != 'true' if: steps.cache.outputs.cache-hit != 'true'
# run: | run: |
# refreshenv refreshenv
# yarn build:native --target ${{ steps.config.outputs.target }} yarn build:native --target ${{ steps.config.outputs.target }}
- name: Install and configure eSigner CKA - name: Install and configure eSigner CKA
run: | run: |