diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index e6e1b7ac..13acfa72 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -122,12 +122,6 @@ jobs: # We need sudo on Linux as it is installed in /opt/ 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 uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a timeout-minutes: 5 diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml index 2d43a34c..9e3f3416 100644 --- a/.github/workflows/build_windows.yaml +++ b/.github/workflows/build_windows.yaml @@ -37,7 +37,6 @@ jobs: environment: ${{ inputs.sign && 'packages.element.io' || '' }} env: SIGNTOOL_PATH: "C:/Program Files (x86)/Windows Kits/10/bin/10.0.22000.0/x86/signtool.exe" - DEBUG: "electron-builder,electron-windows-sign" steps: - uses: nbucic/variable-mapper@0673f6891a0619ba7c002ecfed0f9f4f39017b6f id: config @@ -82,26 +81,26 @@ jobs: # ActiveTCL package on choco is from 2015, # this one is newer but includes more than we need - # - name: Choco install tclsh - # if: steps.cache.outputs.cache-hit != 'true' - # shell: pwsh - # run: | - # choco install -y magicsplat-tcl-tk --no-progress - # echo "${HOME}/AppData/Local/Apps/Tcl86/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - name: Choco install tclsh + if: steps.cache.outputs.cache-hit != 'true' + shell: pwsh + run: | + choco install -y magicsplat-tcl-tk --no-progress + echo "${HOME}/AppData/Local/Apps/Tcl86/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - # - name: Choco install NetWide Assembler - # if: steps.cache.outputs.cache-hit != 'true' - # shell: pwsh - # run: | - # choco install -y nasm --no-progress - # echo "C:/Program Files/NASM" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - name: Choco install NetWide Assembler + if: steps.cache.outputs.cache-hit != 'true' + shell: pwsh + run: | + choco install -y nasm --no-progress + echo "C:/Program Files/NASM" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - # - name: Install Rust - # if: steps.cache.outputs.cache-hit != 'true' - # run: | - # rustup toolchain install stable --profile minimal --no-self-update - # rustup default stable - # rustup target add ${{ steps.config.outputs.target }} + - name: Install Rust + if: steps.cache.outputs.cache-hit != 'true' + run: | + rustup toolchain install stable --profile minimal --no-self-update + rustup default stable + rustup target add ${{ steps.config.outputs.target }} - uses: actions/setup-node@v4 with: @@ -112,11 +111,11 @@ jobs: - name: Install Deps run: "yarn install --frozen-lockfile" - # - name: Build Natives - # if: steps.cache.outputs.cache-hit != 'true' - # run: | - # refreshenv - # yarn build:native --target ${{ steps.config.outputs.target }} + - name: Build Natives + if: steps.cache.outputs.cache-hit != 'true' + run: | + refreshenv + yarn build:native --target ${{ steps.config.outputs.target }} - name: Install and configure eSigner CKA run: |