From 615e4ca822ebc03164e3164247fbaf9454ea9aa3 Mon Sep 17 00:00:00 2001 From: tsukumi Date: Sat, 26 Aug 2023 08:07:26 +0000 Subject: [PATCH] =?UTF-8?q?arm32=20=E3=81=AE=20CI=20=E3=82=B5=E3=83=9D?= =?UTF-8?q?=E3=83=BC=E3=83=88=E3=82=92=E5=89=8A=E9=99=A4=E3=81=97=E3=80=81?= =?UTF-8?q?CI=20=E5=AF=BE=E8=B1=A1=E3=81=AE=20OS=20=E3=82=92=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Dockerfile | 5 ++++- .github/workflows/build-package.yml | 26 +++++++++---------------- .github/workflows/build.yml | 30 ++++++++++++++++++++--------- 3 files changed, 34 insertions(+), 27 deletions(-) diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile index 6ee769a..e5daab7 100644 --- a/.github/workflows/Dockerfile +++ b/.github/workflows/Dockerfile @@ -1,4 +1,7 @@ ARG IMAGE FROM ${IMAGE} ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update && apt-get install -y build-essential cmake cmake-data libpcsclite-dev pkg-config +RUN apt-get update && apt-get install -y build-essential ca-certificates libpcsclite-dev pkg-config wget +RUN wget https://github.com/Kitware/CMake/releases/download/v3.27.4/cmake-3.27.4-linux-aarch64.sh && \ + sh ./cmake-3.27.4-Linux-x86_64.sh --prefix=/usr/local --skip-license && \ + rm ./cmake-3.27.4-Linux-x86_64.sh diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml index 98bd795..91d9294 100644 --- a/.github/workflows/build-package.yml +++ b/.github/workflows/build-package.yml @@ -3,12 +3,8 @@ on: push jobs: windows: - name: Windows - strategy: - matrix: - os: - - windows-2019 - runs-on: ${{ matrix.os }} + name: Windows Package + runs-on: windows-2019 steps: - name: setup msbuild uses: microsoft/setup-msbuild@v1.1 @@ -41,6 +37,7 @@ jobs: path: ${{ steps.get_output_name.outputs.archive_path }} deb-package: + name: Debian Package runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 @@ -63,29 +60,24 @@ jobs: path: ${{ steps.get_output_name.outputs.deb_path }} deb-package-arm: - strategy: - matrix: - image: - - arm64v8/ubuntu + name: Debian Package (ARM) runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: docker/setup-qemu-action@v2 - uses: docker/setup-buildx-action@v2 - - name: setup uses: docker/build-push-action@v3 with: context: .github/workflows/ - tags: ${{ matrix.image }}:build - build-args: IMAGE=${{ matrix.image }}:20.04 - cache-from: type=gha,scope=${{ matrix.image }} - cache-to: type=gha,scope=${{ matrix.image }},mode=max + tags: arm64v8/ubuntu:build + build-args: IMAGE=arm64v8/ubuntu:20.04 + cache-from: type=gha,scope=arm64v8/ubuntu + cache-to: type=gha,scope=arm64v8/ubuntu,mode=max load: true - - name: build run: | - docker run --rm -i -v $(pwd):/work -w /work -e CLICOLOR_FORCE=1 ${{ matrix.image }}:build bash -c \ + docker run --rm -i -v $(pwd):/work -w /work -e CLICOLOR_FORCE=1 arm64v8/ubuntu:build bash -c \ 'cmake -B build -DCMAKE_INSTALL_PREFIX=/usr && cd build && make package' - name: get output name id: get_output_name diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 41ba02f..bd9cd42 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,13 +6,16 @@ jobs: name: Ubuntu strategy: matrix: + os: + - ubuntu-20.04 + - ubuntu-22.04 cc: [gcc, clang] include: - cc: gcc cxx: g++ - cc: clang cxx: clang++ - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} env: CLICOLOR_FORCE: 1 steps: @@ -29,21 +32,21 @@ jobs: run: | ./build/b1 2>&1 | grep --color=always "ARIB STD-B1" ./build/b25 2>&1 | grep --color=always "ARIB STD-B25" + ./build/arib-b1-stream-test --help 2>&1 | grep --color=always "ARIB STD-B1" + ./build/arib-b25-stream-test --help 2>&1 | grep --color=always "ARIB STD-B25" arm: name: ARM strategy: matrix: image: - - raspbian/stretch - - arm32v7/ubuntu - arm64v8/ubuntu + - arm64v8/debian runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: docker/setup-qemu-action@v2 - uses: docker/setup-buildx-action@v2 - - name: setup uses: docker/build-push-action@v3 with: @@ -53,7 +56,6 @@ jobs: cache-from: type=gha,scope=${{ matrix.image }} cache-to: type=gha,scope=${{ matrix.image }},mode=max load: true - - name: configure run: | mkdir build @@ -64,12 +66,16 @@ jobs: run: | docker run --rm -i -v $(pwd):/work -w /work/build -e CLICOLOR_FORCE=1 ${{ matrix.image }}:build bash -c './b1 2>&1 | grep --color=always "ARIB STD-B1"' docker run --rm -i -v $(pwd):/work -w /work/build -e CLICOLOR_FORCE=1 ${{ matrix.image }}:build bash -c './b25 2>&1 | grep --color=always "ARIB STD-B25"' + docker run --rm -i -v $(pwd):/work -w /work/build -e CLICOLOR_FORCE=1 ${{ matrix.image }}:build bash -c './arib-b1-stream-test --help 2>&1 | grep --color=always "ARIB STD-B1"' + docker run --rm -i -v $(pwd):/work -w /work/build -e CLICOLOR_FORCE=1 ${{ matrix.image }}:build bash -c './arib-b25-stream-test --help 2>&1 | grep --color=always "ARIB STD-B25"' - macosx: - name: macOS X + macos: + name: macOS strategy: matrix: - os: [macos-11, macos-12] + os: + - macos-12 + - macos-13 runs-on: ${{ matrix.os }} env: CLICOLOR_FORCE: 1 @@ -85,14 +91,16 @@ jobs: run: | ./build/b1 2>&1 | grep --color=always "ARIB STD-B1" ./build/b25 2>&1 | grep --color=always "ARIB STD-B25" + ./build/arib-b1-stream-test --help 2>&1 | grep --color=always "ARIB STD-B1" + ./build/arib-b25-stream-test --help 2>&1 | grep --color=always "ARIB STD-B25" windows: name: Windows strategy: matrix: os: - - windows-2022 - windows-2019 + - windows-2022 runs-on: ${{ matrix.os }} steps: - name: setup msbuild @@ -108,3 +116,7 @@ jobs: x64\Release\b1.exe 2>&1 | findstr "ARIB STD-B1" Win32\Release\b25.exe 2>&1 | findstr "ARIB STD-B25" x64\Release\b25.exe 2>&1 | findstr "ARIB STD-B25" + Win32\Release\arib-b1-stream-test.exe --help 2>&1 | findstr "ARIB STD-B1" + x64\Release\arib-b1-stream-test.exe --help 2>&1 | findstr "ARIB STD-B1" + Win32\Release\arib-b25-stream-test.exe --help 2>&1 | findstr "ARIB STD-B25" + x64\Release\arib-b25-stream-test.exe --help 2>&1 | findstr "ARIB STD-B25"