From 58882bbc4f3b252058679bbfbd471bedbaefae67 Mon Sep 17 00:00:00 2001 From: k-matsuzawa Date: Sun, 3 Nov 2024 17:44:37 +0900 Subject: [PATCH] feat: update CI --- .github/workflows/check_pre-merge.yml | 2 +- .../workflows/create_release-and-upload.yml | 73 +++++++++---------- 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/.github/workflows/check_pre-merge.yml b/.github/workflows/check_pre-merge.yml index c3c0023..11f05e1 100644 --- a/.github/workflows/check_pre-merge.yml +++ b/.github/workflows/check_pre-merge.yml @@ -20,7 +20,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-2019, macos-12, ubuntu-20.04] + os: [windows-2022, macos-15, ubuntu-24.04] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/create_release-and-upload.yml b/.github/workflows/create_release-and-upload.yml index 2048446..4ece382 100644 --- a/.github/workflows/create_release-and-upload.yml +++ b/.github/workflows/create_release-and-upload.yml @@ -8,18 +8,18 @@ on: jobs: create_releases: name: create-releases - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get the version id: get_version run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT shell: bash - name: Create Release id: create_release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: name: Release ${{ steps.get_version.outputs.VERSION }} body: | @@ -50,7 +50,7 @@ jobs: steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get the version id: get_version run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT @@ -95,7 +95,7 @@ jobs: dir . - name: Upload Release Asset id: upload-release-asset - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: ${{ steps.asset_name.outputs.ASSET_NAME }} @@ -106,7 +106,7 @@ jobs: strategy: fail-fast: false matrix: - os_ver: [20, 22] + os_ver: [20, 22, 24] bin: [gcc, gcc-static] include: - bin: gcc @@ -116,7 +116,7 @@ jobs: steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get the version id: get_version run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT @@ -147,22 +147,22 @@ jobs: run: mv ./cfd-sys/cfd-cmake/dist/cfd.zip ${{ steps.asset_name.outputs.ASSET_NAME }} - name: Upload Release Asset id: upload-release-asset - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: ${{ steps.asset_name.outputs.ASSET_NAME }} upload-object-alpine: name: upload-object-alpine needs: create_releases - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: - alpine: ['3.15', '3.16', '3.17', '3.18'] + alpine: ['3.17', '3.18', '3.19', '3.20'] steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get the version id: get_version run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT @@ -172,16 +172,6 @@ jobs: shell: bash - name: list run: ls -a $GITHUB_WORKSPACE - - name: docker setup 3.15 - if: matrix.alpine == '3.15' - uses: docker://alpine:3.15 - with: - entrypoint: /github/workspace/.github/workflows/docker/alpine_build_entrypoint.sh - - name: docker setup 3.16 - if: matrix.alpine == '3.16' - uses: docker://alpine:3.16 - with: - entrypoint: /github/workspace/.github/workflows/docker/alpine_build_entrypoint.sh - name: docker setup 3.17 if: matrix.alpine == '3.17' uses: docker://alpine:3.17 @@ -192,6 +182,16 @@ jobs: uses: docker://alpine:3.18 with: entrypoint: /github/workspace/.github/workflows/docker/alpine_build_entrypoint.sh + - name: docker setup 3.19 + if: matrix.alpine == '3.19' + uses: docker://alpine:3.19 + with: + entrypoint: /github/workspace/.github/workflows/docker/alpine_build_entrypoint.sh + - name: docker setup 3.20 + if: matrix.alpine == '3.20' + uses: docker://alpine:3.20 + with: + entrypoint: /github/workspace/.github/workflows/docker/alpine_build_entrypoint.sh - name: create archive file run: | echo "---- dump output data ----" @@ -211,7 +211,7 @@ jobs: run: mv /tmp/cfd/cfd.zip ${{ steps.asset_name.outputs.ASSET_NAME }} - name: Upload Release Asset id: upload-release-asset - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: ${{ steps.asset_name.outputs.ASSET_NAME }} @@ -222,19 +222,18 @@ jobs: strategy: fail-fast: false matrix: - xcode: ['12.5.1', '13.2.1', '13.4.1', '14.2', '14.3.1'] + os: ['macos-13', 'macos-14', 'macos-15'] shared: [on, off] include: - - xcode: '12.5.1' - os: macos-11 - - xcode: '13.2.1' - os: macos-11 - - xcode: '13.4.1' - os: macos-12 - - xcode: '14.2' - os: macos-12 - - xcode: '14.3.1' - os: macos-13 + - os: macos-13 + xcode: '14.3.1' + arch: 'x86_64' + - os: macos-14 + xcode: '15.4' + arch: 'arm64' + - os: macos-15 + xcode: '16.1' + arch: 'arm64' - shared: on suffix: '' - shared: off @@ -242,7 +241,7 @@ jobs: steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get the version id: get_version run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT @@ -266,8 +265,8 @@ jobs: echo "---- dump zip file ----" ls -l cd ../../.. - mv ./cfd-sys/cfd-cmake/dist/cfd.zip ./cfd-sys-${{ steps.get_version.outputs.VERSION }}-osx-xcode${{ matrix.xcode }}${{ matrix.suffix }}-x86_64.zip + mv ./cfd-sys/cfd-cmake/dist/cfd.zip ./cfd-sys-${{ steps.get_version.outputs.VERSION }}-osx-xcode${{ matrix.xcode }}${{ matrix.suffix }}-${{ matrix.arch }}.zip - name: Upload Release Asset Ubuntu - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: - files: cfd-sys-${{ steps.get_version.outputs.VERSION }}-osx-xcode${{ matrix.xcode }}${{ matrix.suffix }}-x86_64.zip + files: cfd-sys-${{ steps.get_version.outputs.VERSION }}-osx-xcode${{ matrix.xcode }}${{ matrix.suffix }}-${{ matrix.arch }}.zip