Skip to content

Commit

Permalink
arm32 の CI サポートを削除し、CI 対象の OS を更新
Browse files Browse the repository at this point in the history
  • Loading branch information
tsukumijima committed Aug 26, 2023
1 parent 06d9169 commit 615e4ca
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 27 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
26 changes: 9 additions & 17 deletions .github/workflows/build-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
30 changes: 21 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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"

0 comments on commit 615e4ca

Please sign in to comment.