Merge pull request #27 from project-tsurugi/ci-prepare-public-2

Modify CI for preparing public - 2nd
project-tsurugi · Oct 1, 2023 · 7f02fcb · 7f02fcb
2 parents 170e4eb + 896f554
commit 7f02fcb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,2 +1,3 @@
 * @kuron99
 
+/.github/ @project-tsurugi/ci-maintainers
diff --git a/.github/actions/install-dependencies/action.yml b/.github/actions/install-dependencies/action.yml
@@ -4,38 +4,47 @@ inputs:
   token:
     description: token for checkout private repo
     required: true
+  checkout:
+    description: Skip checkout if false
+    default: true
+  path:
+    description: Relative path under $GITHUB_WORKSPACE to place the repository
+    default: build-deps
 
 runs:
   using: "composite"
 
   steps:
     - name: Checkout_Limestone
       uses: actions/checkout@v3
+      if: ${{ inputs.checkout == 'true' }}
       with:
         repository: project-tsurugi/limestone
-        path: build-deps/limestone
+        path: ${{ inputs.path }}/limestone
         ref: master
         token: ${{ inputs.token }}
 
     - name: Checkout_Yakushima
       uses: actions/checkout@v3
+      if: ${{ inputs.checkout == 'true' }}
       with:
         repository: project-tsurugi/yakushima
-        path: build-deps/yakushima
+        path: ${{ inputs.path }}/yakushima
         ref: master
         token: ${{ inputs.token }}
 
     - name: Checkout_Shirakami
       uses: actions/checkout@v3
+      if: ${{ inputs.checkout == 'true' }}
       with:
         repository: project-tsurugi/shirakami
-        path: build-deps/shirakami
+        path: ${{ inputs.path }}/shirakami
         ref: master
         token: ${{ inputs.token }}
 
     - name: Install_Limestone
       run: |
-        cd build-deps/limestone
+        cd ${{ inputs.path }}/limestone
         rm -fr build
         mkdir build
         cd build
@@ -45,7 +54,7 @@ runs:
 
     - name: Install_Yakushima
       run: |
-        cd build-deps/yakushima
+        cd ${{ inputs.path }}/yakushima
         rm -fr build
         mkdir build
         cd build
@@ -55,7 +64,7 @@ runs:
 
     - name: Install_Shirakami
       run: |
-        cd build-deps/shirakami
+        cd ${{ inputs.path }}/shirakami
         rm -fr build
         mkdir build
         cd build

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -13,7 +13,7 @@ jobs:
       checks: write
     timeout-minutes: 30
     container:
-      image: ghcr.io/project-tsurugi/oltp-sandbox:${{ matrix.os }}
+      image: ghcr.io/project-tsurugi/tsurugi-ci:${{ matrix.os }}
       credentials:
         username: ${{ github.repository_owner }}
         password: ${{ secrets.GHCR_PAT }}
@@ -42,7 +42,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/.local -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/.local ..
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/.local ..
           cmake --build . --target all --clean-first
 
       - name: CTest
@@ -65,10 +65,7 @@ jobs:
       checks: write
     timeout-minutes: 30
     container:
-      image: ghcr.io/project-tsurugi/oltp-sandbox:ubuntu-22.04
-      credentials:
-        username: ${{ github.repository_owner }}
-        password: ${{ secrets.GHCR_PAT }}
+      image: ghcr.io/project-tsurugi/tsurugi-ci:ubuntu-22.04
       volumes:
         - ${{ vars.ccache_dir }}:${{ vars.ccache_dir }}
     defaults: