Merge pull request #32 from shiguredo/feature/update-actions-version

Github Actions の actions/cache, actions/checkout を v4 に上げる
shiguredo · May 13, 2024 · abf1b4b · abf1b4b
2 parents 188df96 + 5f60824
commit abf1b4b
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 72 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -38,7 +38,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Cache release directory
         id: cache-release
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: release/_deps
           key: ${{ matrix.os }}-release-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/release/Makefile')) }}
@@ -53,23 +53,28 @@ jobs:
           echo "timestamp=${NOW}" >> "$GITHUB_OUTPUT"
       - name: Cache ~/.ccache directory
         id: cache-ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.ccache
           key: ${{ matrix.os }}-ccache-dir-${{ steps.ccache_cache_timestamp.outputs.timestamp }}
           restore-keys: ${{ matrix.os }}-ccache-dir-
       - name: Ccache stat
         run: ccache -s
+      - name: Setup LLVM
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          sudo ./llvm.sh 18
       - name: mkdir release
         shell: bash
         run: |
           [ -d release ] || mkdir release
       - name: cmake
-        run: cmake .. -DCMAKE_BUILD_TYPE=Release -DWITH_TEST=YES -DWITH_CLI=YES -WITH_EXAMPLE=YES
+        run: cmake .. -DCMAKE_BUILD_TYPE=Release -DWITH_TEST=YES -DWITH_CLI=YES -DWITH_EXAMPLE=YES
         working-directory: release
         timeout-minutes: 120
       - name: build
-        run:  cmake --build release
+        run:  cmake --build release -j`nproc`
         timeout-minutes: 120
       - name: Test cpp-mp4
         run: cmake --build release --target test -- ARGS='-V'

diff --git a/CHANGES.md b/CHANGES.md
@@ -12,76 +12,81 @@
 
 ## develop
 
+- [UPDATE] Github Actions の actions/cache, actions/checkout をアップデート
+- Node.js 16 の Deprecated に伴うアップデート
+  - actions/cache@v3 から actions/cache@v4 にアップデート
+- @miosakuma @torikizi
+
 ## 2023.2.1
 
 - [FIX] Version 上げ忘れを修正
-    - @haruyama
+  - @haruyama
 
 ## 2023.2.0
 
 - [UPDATE] 依存ライブラリの更新
-    - `boost` を `1.83.0` に
-    - `rapidcsv` を `8.77` に
-    - @haruyama
+  - `boost` を `1.83.0` に
+  - `rapidcsv` を `8.77` に
+  - @haruyama
 - [ADD] H.264 Track のサポート
-    - @haruyama
+  - @haruyama
 - [UPDATE] AV1 Track の調整
-    - @haruyama
+  - @haruyama
 
 ## 2023.1.1
 
 - [FIX] Version 上げ忘れを修正 #25 
-    - @haruyama
-    - https://github.com/shiguredo/cpp-mp4/pull/25
+  - @haruyama
+  - https://github.com/shiguredo/cpp-mp4/pull/25
 
 ## 2023.1.0
 
 - [UPDATE] 依存ライブラリの更新
-    - `boost` を `1.81.0` に
-    - `CLI11` を `2.3.2` に
-    - `fmt` を `9.1.0` に
-    - `spdlog` を `1.11.0` に
-    - `rapidcsv` を `8.69` に
-    - @haruyama
-    - https://github.com/shiguredo/cpp-mp4/pull/20
+  - `boost` を `1.81.0` に
+  - `CLI11` を `2.3.2` に
+  - `fmt` を `9.1.0` に
+  - `spdlog` を `1.11.0` に
+  - `rapidcsv` を `8.69` に
+  - @haruyama
+  - https://github.com/shiguredo/cpp-mp4/pull/20
 - [FIX] Safari, Windows Media Player などでの再生の問題を修正
-    - @haruyama
-    - https://github.com/shiguredo/cpp-mp4/pull/19
+  - @haruyama
+  - https://github.com/shiguredo/cpp-mp4/pull/19
 - [FIX] typo の修正
-    - @haruyama
-    - https://github.com/shiguredo/cpp-mp4/pull/18
+  - @haruyama
+  - https://github.com/shiguredo/cpp-mp4/pull/18
 
 ## 2022.1.0
 
 - [UPDATE] 依存ライブラリの更新
-    - `boost` を `1.78.0` に
-    - `CLI11` を `2.1.2` に
-    - `fmt` を `8.0.1` に
-    - `spdlog` を `1.9.2` に
-    - `rapidcsv` を `8.53` に
-    - @haruyama
+  - `boost` を `1.78.0` に
+  - `CLI11` を `2.1.2` に
+  - `fmt` を `8.0.1` に
+  - `spdlog` を `1.9.2` に
+  - `rapidcsv` を `8.53` に
+  - @haruyama
 - [FIX] 宇宙船演算子を利用している箇所に #include <compare> を追加
-    - @haruyama
-    - https://github.com/shiguredo/cpp-mp4/pull/12
+  - @haruyama
+  - https://github.com/shiguredo/cpp-mp4/pull/12
 
 ## 2021.3
 
 - [UPDATE] `boost` を `1.76.0` に
-    - @haruyama
-    - https://github.com/shiguredo/cpp-mp4/pull/8
+  - @haruyama
+  - https://github.com/shiguredo/cpp-mp4/pull/8
 
 ## 2021.2
 
 - [ADD] av01, av1C box のサポート
-    - @haruyama
+  - @haruyama
 - [ADD] get_version_string() の追加
-    - @haruyama
+  - @haruyama
 - [UPDATE] `rapidcsv` を `8.48` に
-    - @haruyama
+  - @haruyama
 - [FIX] MP4 ファイルの読み込み時に, ファイル終端を越える box のサイズを指定されたら例外を投げる
-    - @haruyama
+  - @haruyama
 - [FIX] VPCodecConfiguration::getDataSize() のバグ修正
-    - @haruyama
+  - @haruyama
 
 ## 2021.1
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,8 +5,8 @@ cmake_policy(SET CMP0054 NEW)
 # MSVC runtime library flags are selected by an abstraction.
 cmake_policy(SET CMP0091 NEW)
 
-set(CMAKE_C_COMPILER clang)
-set(CMAKE_CXX_COMPILER clang++)
+set(CMAKE_C_COMPILER clang-18)
+set(CMAKE_CXX_COMPILER clang++-18)
 
 include(cmake/env.cmake)
 include(cmake/tools.cmake)
@@ -266,9 +266,9 @@ target_sources(shiguredo-mp4
     src/writer/faststart_writer.cpp
     )
 
+target_include_directories(shiguredo-mp4 PRIVATE include)
 target_include_directories(shiguredo-mp4
-    PRIVATE
-    include
+    SYSTEM PRIVATE
     ${boost_assert_SOURCE_DIR}/include
     ${boost_bind_SOURCE_DIR}/include
     ${boost_config_SOURCE_DIR}/include
@@ -312,9 +312,9 @@ if(WITH_CLI)
         src/cli/mp4-tool.cpp
         )
 
+    target_include_directories(mp4-tool PRIVATE include)
     target_include_directories(mp4-tool
-        PRIVATE
-        include
+        SYSTEM PRIVATE
         ${boost_assert_SOURCE_DIR}/include
         ${boost_bind_SOURCE_DIR}/include
         ${boost_config_SOURCE_DIR}/include
@@ -369,10 +369,9 @@ if(WITH_EXAMPLE)
         example/resource/resource.cpp
         )
 
+    target_include_directories(mp4-muxer PRIVATE include example)
     target_include_directories(mp4-muxer
-        PRIVATE
-        include
-        example
+        SYSTEM PRIVATE
         ${boost_assert_SOURCE_DIR}/include
         ${boost_bind_SOURCE_DIR}/include
         ${boost_config_SOURCE_DIR}/include

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -5,9 +5,6 @@ add_subdirectory(endian)
 add_subdirectory(time)
 add_subdirectory(track)
 
-set(CMAKE_C_COMPILER clang)
-set(CMAKE_CXX_COMPILER clang++)
-
 add_compile_options(
     -Wall
     -Wextra
@@ -33,9 +30,9 @@ add_executable(mp4_test
 
 set_target_properties(mp4_test PROPERTIES CXX_STANDARD 20 C_STANDARD 11)
 
+target_include_directories(mp4_test PRIVATE ../include)
 target_include_directories(mp4_test
-    PRIVATE
-    ../include
+    SYSTEM PRIVATE
     ${boost_algorithm_SOURCE_DIR}/include
     ${boost_assert_SOURCE_DIR}/include
     ${boost_bind_SOURCE_DIR}/include

diff --git a/test/bitio/CMakeLists.txt b/test/bitio/CMakeLists.txt
@@ -1,8 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
 
-set(CMAKE_C_COMPILER clang)
-set(CMAKE_CXX_COMPILER clang++)
-
 add_compile_options(
     -Wall
     -Wextra
@@ -29,9 +26,9 @@ add_executable(bitio_test
 
 set_target_properties(bitio_test PROPERTIES CXX_STANDARD 20 C_STANDARD 11)
 
+target_include_directories(bitio_test PRIVATE ../../include)
 target_include_directories(bitio_test
-    PRIVATE
-    ../../include
+    SYSTEM PRIVATE
     ${boost_algorithm_SOURCE_DIR}/include
     ${boost_assert_SOURCE_DIR}/include
     ${boost_bind_SOURCE_DIR}/include

diff --git a/test/endian/CMakeLists.txt b/test/endian/CMakeLists.txt
@@ -1,8 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
 
-set(CMAKE_C_COMPILER clang)
-set(CMAKE_CXX_COMPILER clang++)
-
 add_compile_options(
     -Wall
     -Wextra
@@ -25,9 +22,9 @@ add_executable(endian_test
 
 set_target_properties(endian_test PROPERTIES CXX_STANDARD 20 C_STANDARD 11)
 
+target_include_directories(endian_test PRIVATE ../../include)
 target_include_directories(endian_test
-    PRIVATE
-    ../../include
+    SYSTEM PRIVATE
     ${boost_algorithm_SOURCE_DIR}/include
     ${boost_assert_SOURCE_DIR}/include
     ${boost_bind_SOURCE_DIR}/include

diff --git a/test/time/CMakeLists.txt b/test/time/CMakeLists.txt
@@ -1,8 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
 
-set(CMAKE_C_COMPILER clang)
-set(CMAKE_CXX_COMPILER clang++)
-
 add_compile_options(
     -Wall
     -Wextra
@@ -25,9 +22,9 @@ add_executable(time_test
 
 set_target_properties(time_test PROPERTIES CXX_STANDARD 20 C_STANDARD 11)
 
+target_include_directories(time_test PRIVATE ../../include)
 target_include_directories(time_test
-    PRIVATE
-    ../../include
+    SYSTEM PRIVATE
     ${boost_algorithm_SOURCE_DIR}/include
     ${boost_assert_SOURCE_DIR}/include
     ${boost_bind_SOURCE_DIR}/include

diff --git a/test/track/CMakeLists.txt b/test/track/CMakeLists.txt
@@ -1,8 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
 
-set(CMAKE_C_COMPILER clang)
-set(CMAKE_CXX_COMPILER clang++)
-
 add_compile_options(
     -Wall
     -Wextra
@@ -104,9 +101,9 @@ add_executable(track_test
 
 set_target_properties(track_test PROPERTIES CXX_STANDARD 20 C_STANDARD 11)
 
+target_include_directories(track_test PRIVATE ../../include)
 target_include_directories(track_test
-    PRIVATE
-    ../../include
+    SYSTEM PRIVATE
     ${boost_algorithm_SOURCE_DIR}/include
     ${boost_assert_SOURCE_DIR}/include
     ${boost_bind_SOURCE_DIR}/include