From abec7e4c6f007deabef452bcacf5325cb01608a0 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Mon, 13 Feb 2023 15:47:20 +0100 Subject: [PATCH] =?UTF-8?q?ci:=20=E2=9A=A1=EF=B8=8F=20Improve=20release.ym?= =?UTF-8?q?l=20and=20add=20aarch64-unknown-linux-gnu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/package.yml | 53 ----------------- .github/workflows/release.yml | 104 ++++++++++++++++++++++------------ 2 files changed, 69 insertions(+), 88 deletions(-) delete mode 100644 .github/workflows/package.yml diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml deleted file mode 100644 index 873a94e..0000000 --- a/.github/workflows/package.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Package - -on: - workflow_call: - inputs: - runs_on: - required: true - type: string - target: - required: true - type: string - extension: - default: "" - type: string - -jobs: - build: - name: Build static binaries - runs-on: ${{ inputs.runs_on }} - - steps: - - name: Change apt mirror and install dependencies - if: ${{ inputs.runs_on == 'ubuntu-latest' }} - run: | - sudo sed -i 's/azure.archive.ubuntu.com/archive.ubuntu.com/' /etc/apt/sources.list - sudo apt-get update - sudo apt-get install musl-tools libudev-dev - - - uses: actions/checkout@v2 - - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: ${{ inputs.target }} - - - uses: Swatinem/rust-cache@v1 - - - uses: actions-rs/cargo@v1 - with: - command: build - args: --release --all --target ${{ inputs.target }} - - - uses: papeloto/action-zip@v1 - with: - files: target/${{ inputs.target }}/release/web-flash${{ inputs.extension }} - recursive: true - dest: web-flash-${{ inputs.target }}.zip - - - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: web-flash-${{ inputs.target }}.zip - tag: ${{ github.ref }} \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 732a8bd..61cb782 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,47 +4,81 @@ on: release: types: [created] +env: + CARGO_TERM_COLOR: always + jobs: - # Linux + build: + name: Generating artifacts for ${{ matrix.job.target }} + runs-on: ${{ matrix.job.os }} + strategy: + fail-fast: false + matrix: + job: + - os: ubuntu-20.04 + target: x86_64-unknown-linux-gnu + - os: ubuntu-20.04 + target: x86_64-unknown-linux-musl + - os: ubuntu-20.04 + target: aarch64-unknown-linux-gnu + - os: windows-latest + target: x86_64-pc-windows-msvc + extension: .exe + - os: windows-latest + target: x86_64-pc-windows-gnu + extension: .exe + - os: macos-latest + target: aarch64-apple-darwin + - os: macos-latest + target: x86_64-apple-darwin - x86_64-unknown-linux-gnu: - uses: ./.github/workflows/package.yml - with: - runs_on: ubuntu-latest - target: x86_64-unknown-linux-gnu + steps: + - name: Checkout repository + uses: actions/checkout@v3 - x86_64-unknown-linux-musl: - uses: ./.github/workflows/package.yml - with: - runs_on: ubuntu-latest - target: x86_64-unknown-linux-musl + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@v1 + with: + toolchain: stable + targets: ${{ matrix.job.target }} - # macOS + - name: Install dependencies + if: matrix.job.os == 'ubuntu-20.04' + run: | + sudo apt-get update + sudo apt-get install libudev-dev librust-libudev-sys-dev pkg-config - aarch64-apple-darwin: - uses: ./.github/workflows/package.yml - with: - runs_on: macos-latest - target: aarch64-apple-darwin + - name: Setup cross compile env + if: matrix.job.target == 'aarch64-unknown-linux-gnu' + run: | + sudo sed -i 's/azure\.//' /etc/apt/sources.list + sudo apt-get update + echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal main universe" | sudo tee -a /etc/apt/sources.list + echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main universe" | sudo tee -a /etc/apt/sources.list + sudo apt update + sudo dpkg --add-architecture arm64 + sudo apt-get install -y curl git libudev-dev musl-tools pkg-config "libudev1:arm64" "libgcc-s1:arm64" "libc6:arm64" "libudev-dev:arm64" gcc-arm-linux-gnueabihf pkg-config-arm-linux-gnueabihf gcc-aarch64-linux-gnu pkg-config-aarch64-linux-gnu + echo "PKG_CONFIG_ALLOW_SYSTEM_LIBS=0" >> $GITHUB_ENV + echo "PKG_CONFIG_DIR=/opt/" >> $GITHUB_ENV + echo "PKG_CONFIG_LIBDIR=/opt/usr/lib/pkgconfig:/opt/usr/share/pkgconfig" >> $GITHUB_ENV + echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV + echo "PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig" >> $GITHUB_ENV + echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV - x86_64-apple-darwin: - uses: ./.github/workflows/package.yml - with: - runs_on: macos-latest - target: x86_64-apple-darwin + - name: Build project + run: cargo build --release --all --target ${{ matrix.job.target }} - # Windows + - name: Compress (Unix) + if: ${{ matrix.job.os != 'windows-latest' }} + run: zip -j web-flash-${{ matrix.job.target }}.zip target/${{ matrix.job.target }}/release/web-flash - x86_64-pc-windows-gnu: - uses: ./.github/workflows/package.yml - with: - runs_on: windows-latest - target: x86_64-pc-windows-gnu - extension: .exe + - name: Compress (Windows) + if: ${{ matrix.job.os == 'windows-latest' }} + run: Compress-Archive target/${{ matrix.job.target }}/release/web-flash${{ matrix.job.extension }} web-flash-${{ matrix.job.target }}.zip - x86_64-pc-windows-msvc: - uses: ./.github/workflows/package.yml - with: - runs_on: windows-latest - target: x86_64-pc-windows-msvc - extension: .exe \ No newline at end of file + - name: Upload archives + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: web-flash-${{ matrix.job.target }}.zip + tag: ${{ github.ref }}