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

Switch to arm runners instead of self-hosted dind runners (#2098)

Browse Source
This commit is contained in:
Michael Telatynski 2025-01-27 13:02:58 +00:00 committed by GitHub
parent 0b622c67c4
commit 2e8bd93795
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,12 +73,12 @@ jobs:
executable: "/opt/Element/element-desktop" executable: "/opt/Element/element-desktop"
prepare_cmd: "sudo apt-get -qq update && sudo apt install ./dist/*.deb" prepare_cmd: "sudo apt-get -qq update && sudo apt install ./dist/*.deb"
- name: "Linux (arm64) (sqlcipher: system)" - name: "Linux (arm64) (sqlcipher: system)"
os: dind-l-arm64 os: ubuntu-22.04-arm
artifact: linux-arm64-sqlcipher-system artifact: linux-arm64-sqlcipher-system
executable: "/opt/Element/element-desktop" executable: "/opt/Element/element-desktop"
prepare_cmd: "sudo apt-get -qq update && sudo apt install -y ./dist/*.deb" prepare_cmd: "sudo apt-get -qq update && sudo apt install -y ./dist/*.deb"
- name: "Linux (arm64) (sqlcipher: static)" - name: "Linux (arm64) (sqlcipher: static)"
os: dind-l-arm64 os: ubuntu-22.04-arm
artifact: linux-arm64-sqlcipher-static artifact: linux-arm64-sqlcipher-static
executable: "/opt/Element/element-desktop" executable: "/opt/Element/element-desktop"
prepare_cmd: "sudo apt-get -qq update && sudo apt install -y ./dist/*.deb" prepare_cmd: "sudo apt-get -qq update && sudo apt install -y ./dist/*.deb"
@ -93,19 +93,6 @@ jobs:
name: Test ${{ matrix.name }} name: Test ${{ matrix.name }}
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
# Workaround for self-hosted runners lacking yarn
- name: Install Yarn
if: runner.environment == 'self-hosted'
run: |
# Sanity check that the arch is arm64 as we expect
[[ $(uname -p) == "aarch64" ]] || exit 1
sudo apt-get -qq update
sudo apt-get install -y curl
curl -fsSL --create-dirs -o $HOME/bin/yarn https://github.com/yarnpkg/yarn/releases/download/v1.22.19/yarn-1.22.19.js
chmod +x $HOME/bin/yarn
echo "$HOME/bin" >> $GITHUB_PATH
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions/setup-node@v4 - uses: actions/setup-node@v4

16
.github/workflows/build_linux.yaml vendored
View File

@ -28,7 +28,7 @@ jobs:
# We build the hak files on native infrastructure as matrix-seshat fails to cross-compile properly # We build the hak files on native infrastructure as matrix-seshat fails to cross-compile properly
# https://github.com/matrix-org/seshat/issues/135 # https://github.com/matrix-org/seshat/issues/135
hak: hak:
runs-on: ${{ inputs.arch == 'arm64' && 'dind-l-arm64' || 'ubuntu-22.04' }} runs-on: ${{ inputs.arch == 'arm64' && 'ubuntu-22.04-arm' || 'ubuntu-22.04' }}
env: env:
HAK_DOCKER_IMAGE: ghcr.io/element-hq/element-desktop-dockerbuild HAK_DOCKER_IMAGE: ghcr.io/element-hq/element-desktop-dockerbuild
outputs: outputs:
@ -36,20 +36,6 @@ jobs:
arch: ${{ steps.config.outputs.arch }} arch: ${{ steps.config.outputs.arch }}
build-args: ${{ steps.config.outputs.build-args }} build-args: ${{ steps.config.outputs.build-args }}
steps: steps:
# Workaround for self-hosted runners lacking tools
- name: Install missing tools
if: runner.environment == 'self-hosted'
run: |
# Sanity check that the arch is arm64 as we expect
[[ $(uname -p) == "aarch64" ]] || exit 1
sudo apt-get -qq update
# curl for yarn download, git for tj-actions/changed-files, zstd for actions/cache
sudo apt-get install -y curl git zstd
curl -fsSL --create-dirs -o $HOME/bin/yarn https://github.com/yarnpkg/yarn/releases/download/v1.22.19/yarn-1.22.19.js
chmod +x $HOME/bin/yarn
echo "$HOME/bin" >> $GITHUB_PATH
- name: Resolve docker image tag for push - name: Resolve docker image tag for push
if: github.event_name == 'push' if: github.event_name == 'push'
run: echo "HAK_DOCKER_IMAGE=$HAK_DOCKER_IMAGE:$GITHUB_REF_NAME" >> $GITHUB_ENV run: echo "HAK_DOCKER_IMAGE=$HAK_DOCKER_IMAGE:$GITHUB_REF_NAME" >> $GITHUB_ENV