From 718d5a803770d6695d651523a61917640907e674 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 30 Mar 2023 14:22:58 +0100 Subject: [PATCH] Run build_linux in docker using an older glibc (#599) --- .github/workflows/build_linux.yaml | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml index b0c245b..f8eff43 100644 --- a/.github/workflows/build_linux.yaml +++ b/.github/workflows/build_linux.yaml @@ -19,6 +19,11 @@ on: jobs: build: runs-on: ubuntu-latest + container: + image: ghcr.io/vector-im/element-desktop-dockerbuild:t3chguy-dockerbuild + defaults: + run: + shell: bash steps: - uses: actions/checkout@v3 @@ -34,20 +39,12 @@ jobs: path: | ./.hak - - name: Install Rust - if: steps.cache.outputs.cache-hit != 'true' - uses: actions-rs/toolchain@v1 - with: - default: true - toolchain: stable - - - name: Install libsqlcipher-dev - if: steps.cache.outputs.cache-hit != 'true' && inputs.sqlcipher == 'system' - run: sudo apt-get install -y libsqlcipher-dev - - uses: actions/setup-node@v3 with: cache: "yarn" + env: + # Workaround for https://github.com/actions/setup-node/issues/317 + FORCE_COLOR: 0 # Does not need branch matching as only analyses this layer - name: Install Deps @@ -71,7 +68,7 @@ jobs: if [ -f changelog.Debian ]; then echo "config-args=--deb-changelog changelog.Debian" >> $GITHUB_OUTPUT fi - + cp "$DIR/control.template" debcontrol VERSION=${INPUT_VERSION:-$(cat package.json | jq -r .version)} echo "Version: $VERSION" >> debcontrol @@ -81,7 +78,7 @@ jobs: - name: Build App run: | - scripts/generate-builder-config.ts \ + npx ts-node scripts/generate-builder-config.ts \ ${{ steps.nightly.outputs.config-args }} \ ${{ steps.debian.outputs.config-args }} \ --deb-custom-control=debcontrol