diff options
| author | Ryo Nakamura <upa@haeena.net> | 2022-11-06 16:00:18 +0900 |
|---|---|---|
| committer | Ryo Nakamura <upa@haeena.net> | 2022-11-06 16:03:47 +0900 |
| commit | df404ec3c6e8e4d218b9742110b52d32bde34a41 (patch) | |
| tree | 020fe6f120c51e0b3e1ed1b3dbeeb0580ce10606 /.github | |
| parent | 15dbb564c8a68a159b997f113751bbbc038b44d0 (diff) | |
cleanup docker files and build/test procedure
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build-ubuntu.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/codeql.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/test.yml | 15 |
3 files changed, 11 insertions, 8 deletions
diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index 596341b..a871f9a 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: install build dependency - run: sudo ./install-build-deps.sh + run: sudo ./scripts/install-build-deps.sh - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 366d6c7..c875499 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -41,7 +41,7 @@ jobs: uses: actions/checkout@v3 - name: Install build dependency - run: sudo ./install-build-deps.sh + run: sudo ./scripts/install-build-deps.sh # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b8b8737..a4c1909 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,4 @@ -name: test on ubuntu +name: test on: push: @@ -12,11 +12,14 @@ env: jobs: test: runs-on: ubuntu-latest - steps: - uses: actions/checkout@v3 - - name: Build test container - run: docker build --rm -t mscp-test -f docker/Dockerfile-test . - - name: Run test - run: docker run --init --rm mscp-test bash -c "/usr/sbin/sshd; cd /mscp/build; ctest --verbose" + - name: Build ubuntu 22.04 container + run: docker build --rm -t mscp-ubuntu:22.04 -f docker/ubuntu-22.04.Dockerfile . + - name: Run test on ubuntu 22.04 + run: docker run --init --rm mscp-ubuntu:22.04 /mscp/scripts/test-in-container.sh + - name: Build centos 8 container + run: docker build --rm -t mscp-centos:8 -f docker/centos-8.Dockerfile . + - name: Run test on centos 8 + run: docker run --init --rm mscp-centos:8 /mscp/scripts/test-in-container.sh |