From 8b625a88655d3cf52e994c964a8d99a36ab5eec5 Mon Sep 17 00:00:00 2001 From: ciscon Date: Wed, 29 May 2024 14:43:45 -0400 Subject: [PATCH] PIPELINE: use debian stable container for builds --- .github/workflows/build-and-deploy-release.yml | 17 ++++++++++------- .github/workflows/build-and-deploy-snapshot.yml | 17 ++++++++++------- .github/workflows/build-targets.yml | 12 +++++++----- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build-and-deploy-release.yml b/.github/workflows/build-and-deploy-release.yml index ab431694..04a288d1 100644 --- a/.github/workflows/build-and-deploy-release.yml +++ b/.github/workflows/build-and-deploy-release.yml @@ -35,15 +35,17 @@ jobs: os: windows arch: x86 ext: ".dll" + container: + image: debian:stable steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Prepare Build Environemnt run: | - sudo apt-get update - sudo apt-get -y install build-essential cmake gcc-i686-linux-gnu - sudo apt-get -y install gcc-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross - sudo apt-get -y install gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 + apt-get update + apt-get -y install build-essential cmake gcc-i686-linux-gnu openssh-client + apt-get -y install gcc-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross + apt-get -y install gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 - name: Build run: | ./build_cmake.sh ${{ matrix.target }} @@ -53,16 +55,17 @@ jobs: - name: Setup SSH env: SSH_AUTH_SOCK: /tmp/ssh_agent.sock + shell: bash run: | ssh-agent -a $SSH_AUTH_SOCK > /dev/null ssh-add - <<< "${{ secrets.SSH_PRIVATE_KEY }}" - name: Set date run: | - sudo timedatectl set-timezone Europe/Amsterdam - echo "DATE=$(date "+%Y%m%d-%H%M%S")" >> $GITHUB_ENV + echo "DATE=$(TZ="Europe/Amsterdam" date "+%Y%m%d-%H%M%S")" >> $GITHUB_ENV - name: Deploy env: SSH_AUTH_SOCK: /tmp/ssh_agent.sock + shell: bash run: | mkdir -p upload/releases/${{ github.ref_name }}/${{ matrix.os }}/${{ matrix.arch }} mkdir -p upload/releases/latest/${{ matrix.os }}/${{ matrix.arch }} diff --git a/.github/workflows/build-and-deploy-snapshot.yml b/.github/workflows/build-and-deploy-snapshot.yml index 385865ba..984fd6df 100644 --- a/.github/workflows/build-and-deploy-snapshot.yml +++ b/.github/workflows/build-and-deploy-snapshot.yml @@ -33,15 +33,17 @@ jobs: os: windows arch: x86 ext: ".dll" + container: + image: debian:stable steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Prepare Build Environemnt run: | - sudo apt-get update - sudo apt-get -y install build-essential cmake gcc-i686-linux-gnu - sudo apt-get -y install gcc-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross - sudo apt-get -y install gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 + apt-get update + apt-get -y install build-essential cmake gcc-i686-linux-gnu openssh-client + apt-get -y install gcc-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross + apt-get -y install gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 - name: Build run: | ./build_cmake.sh ${{ matrix.target }} @@ -51,16 +53,17 @@ jobs: - name: Setup SSH env: SSH_AUTH_SOCK: /tmp/ssh_agent.sock + shell: bash run: | ssh-agent -a $SSH_AUTH_SOCK > /dev/null ssh-add - <<< "${{ secrets.SSH_PRIVATE_KEY }}" - name: Set date run: | - sudo timedatectl set-timezone Europe/Amsterdam - echo "DATE=$(date "+%Y%m%d-%H%M%S")" >> $GITHUB_ENV + echo "DATE=$(TZ="Europe/Amsterdam" date "+%Y%m%d-%H%M%S")" >> $GITHUB_ENV - name: Deploy env: SSH_AUTH_SOCK: /tmp/ssh_agent.sock + shell: bash run: | mkdir -p upload/snapshots/${{ matrix.os }}/${{ matrix.arch }} mkdir -p upload/snapshots/latest/${{ matrix.os }}/${{ matrix.arch }} diff --git a/.github/workflows/build-targets.yml b/.github/workflows/build-targets.yml index a7ce9e95..0ad1e644 100644 --- a/.github/workflows/build-targets.yml +++ b/.github/workflows/build-targets.yml @@ -33,15 +33,17 @@ jobs: os: windows arch: x86 ext: ".dll" + container: + image: debian:stable steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Prepare Build Environemnt run: | - sudo apt-get update - sudo apt-get -y install build-essential cmake gcc-i686-linux-gnu - sudo apt-get -y install gcc-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross - sudo apt-get -y install gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 + apt-get update + apt-get -y install build-essential cmake gcc-i686-linux-gnu + apt-get -y install gcc-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross + apt-get -y install gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 - name: Build run: | ./build_cmake.sh ${{ matrix.target }}