From 0cadcd8d62a46a1a138853b3429a4845e1c04e49 Mon Sep 17 00:00:00 2001 From: Horimoto Yasuhiro Date: Wed, 19 Apr 2023 14:18:46 +0900 Subject: [PATCH 01/19] Use mysql:8.0-oracle for base image --- mysql-8.0/Dockerfile | 48 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/mysql-8.0/Dockerfile b/mysql-8.0/Dockerfile index 0fe97a8..ef97c9d 100644 --- a/mysql-8.0/Dockerfile +++ b/mysql-8.0/Dockerfile @@ -1,34 +1,34 @@ -FROM mysql:8.0.30-debian +FROM mysql:8.0.32-oracle MAINTAINER groonga -ENV groonga_version=12.0.6 \ - mroonga_version=12.06 +ENV groonga_version=13.0.1 \ + mroonga_version=13.01 \ RUN mkdir -p /etc/mysql/mysql.conf.d && \ touch /etc/mysql/mysql.conf.d/default-auth-override.cnf && \ touch /etc/mysql/mysql.conf.d/lowercase-table-names.cnf && \ - apt update && \ - apt install -y -V --no-install-recommends \ - ca-certificates \ - lsb-release \ + major_version=$(cut -d: -f5 /etc/system-release-cpe | grep -o "^[0-9]") && \ + microdnf install -y \ wget && \ - code_name=$(lsb_release --codename --short) && \ - wget https://packages.groonga.org/debian/groonga-apt-source-latest-${code_name}.deb && \ - apt install -y -V --no-install-recommends \ - ./groonga-apt-source-latest-${code_name}.deb && \ - rm groonga-apt-source-latest-${code_name}.deb && \ - apt update && \ - apt install -y -V --no-install-recommends \ - groonga-bin=${groonga_version}-1 \ - groonga-normalizer-mysql \ - groonga-tokenizer-mecab=${groonga_version}-1 \ - mysql-community-8.0-mroonga=${mroonga_version}-1 && \ - sed \ - -i'' \ - -e 's,@MRN_DATA_DIR@,/usr/share/mroonga,g' \ - /usr/share/mroonga/install.sql && \ - apt clean && \ - rm -rf /var/lib/apt/lists/* + microdnf install -y \ + cmake-filesystem \ + lz4 \ + snappy \ + xxhash-libs && \ + epel_base=https://dl.fedoraproject.org/pub/epel/${major_version}/Everything/x86_64/Packages && \ + wget ${epel_base}/m/msgpack-3.1.0-3.el8.x86_64.rpm && \ + wget ${epel_base}/r/re2-20190801-1.el8.x86_64.rpm && \ + powertools_base=https://repo.almalinux.org/almalinux/${major_version}/PowerTools/x86_64/os/Packages && \ + wget ${powertools_base}/glog-0.3.5-3.el8.x86_64.rpm && \ + wget ${powertools_base}/gflags-devel-2.1.2-6.el8.x86_64.rpm && \ + wget ${powertools_base}/gflags-2.1.2-6.el8.x86_64.rpm && \ + apache_arrow_base=https://apache.jfrog.io/artifactory/arrow/almalinux/${major_version}/x86_64/Packages && \ + wget ${apache_arrow_base}/arrow11-libs-11.0.0-1.el8.x86_64.rpm && \ + groonga_base=http://packages.groonga.org/almalinux/${major_version}/x86_64/Packages && \ + wget ${groonga_base}/mysql-community-minimal-8.0-mroonga-13.01-1.el8.x86_64.rpm && \ + wget ${groonga_base}/groonga-libs-13.0.1-1.el8.x86_64.rpm && \ + wget ${groonga_base}/groonga-normalizer-mysql-1.2.1-1.el8.x86_64.rpm && \ + rpm -ivh ./*.rpm && \ RUN mkdir -p /docker-entrypoint-mroonga-initdb.d && \ cp /usr/share/mroonga/install.sql \ From ff93f55631673c33d252c6bbf17c14aae7991627 Mon Sep 17 00:00:00 2001 From: Horimoto Yasuhiro Date: Fri, 21 Apr 2023 11:36:27 +0900 Subject: [PATCH 02/19] Use "microdnf install -y epel-release" --- mysql-8.0/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mysql-8.0/Dockerfile b/mysql-8.0/Dockerfile index ef97c9d..e8ff183 100644 --- a/mysql-8.0/Dockerfile +++ b/mysql-8.0/Dockerfile @@ -8,16 +8,17 @@ RUN mkdir -p /etc/mysql/mysql.conf.d && \ touch /etc/mysql/mysql.conf.d/default-auth-override.cnf && \ touch /etc/mysql/mysql.conf.d/lowercase-table-names.cnf && \ major_version=$(cut -d: -f5 /etc/system-release-cpe | grep -o "^[0-9]") && \ + microdnf install -y \ + epel-release && \ microdnf install -y \ wget && \ microdnf install -y \ cmake-filesystem \ lz4 \ + msgpack \ + re2 \ snappy \ xxhash-libs && \ - epel_base=https://dl.fedoraproject.org/pub/epel/${major_version}/Everything/x86_64/Packages && \ - wget ${epel_base}/m/msgpack-3.1.0-3.el8.x86_64.rpm && \ - wget ${epel_base}/r/re2-20190801-1.el8.x86_64.rpm && \ powertools_base=https://repo.almalinux.org/almalinux/${major_version}/PowerTools/x86_64/os/Packages && \ wget ${powertools_base}/glog-0.3.5-3.el8.x86_64.rpm && \ wget ${powertools_base}/gflags-devel-2.1.2-6.el8.x86_64.rpm && \ From 0408bc6defbc210b606c5ffbaf9ec7b800615c78 Mon Sep 17 00:00:00 2001 From: Horimoto Yasuhiro Date: Fri, 21 Apr 2023 11:41:00 +0900 Subject: [PATCH 03/19] Remove a needless "\" --- mysql-8.0/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-8.0/Dockerfile b/mysql-8.0/Dockerfile index e8ff183..2705dd7 100644 --- a/mysql-8.0/Dockerfile +++ b/mysql-8.0/Dockerfile @@ -2,7 +2,7 @@ FROM mysql:8.0.32-oracle MAINTAINER groonga ENV groonga_version=13.0.1 \ - mroonga_version=13.01 \ + mroonga_version=13.01 RUN mkdir -p /etc/mysql/mysql.conf.d && \ touch /etc/mysql/mysql.conf.d/default-auth-override.cnf && \ From b58f061863e7a4595f46b684b454e4479c0c14ff Mon Sep 17 00:00:00 2001 From: Horimoto Yasuhiro Date: Fri, 21 Apr 2023 11:49:29 +0900 Subject: [PATCH 04/19] Install "apache-arrow-release-latest.rpm" instead of using "wget" --- mysql-8.0/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mysql-8.0/Dockerfile b/mysql-8.0/Dockerfile index 2705dd7..c1cfba9 100644 --- a/mysql-8.0/Dockerfile +++ b/mysql-8.0/Dockerfile @@ -10,9 +10,13 @@ RUN mkdir -p /etc/mysql/mysql.conf.d && \ major_version=$(cut -d: -f5 /etc/system-release-cpe | grep -o "^[0-9]") && \ microdnf install -y \ epel-release && \ + wget https://apache.jfrog.io/artifactory/arrow/almalinux/$(cut -d: -f5 /etc/system-release-cpe | cut -d. -f1)/apache-arrow-release-latest.rpm && \ + rpm -Uvh apache-arrow-release-latest.rpm && \ + sed -i'' -e '26d' /etc/pki/rpm-gpg/RPM-GPG-KEY-Apache-Arrow && \ microdnf install -y \ wget && \ microdnf install -y \ + arrow11-libs \ cmake-filesystem \ lz4 \ msgpack \ @@ -23,13 +27,11 @@ RUN mkdir -p /etc/mysql/mysql.conf.d && \ wget ${powertools_base}/glog-0.3.5-3.el8.x86_64.rpm && \ wget ${powertools_base}/gflags-devel-2.1.2-6.el8.x86_64.rpm && \ wget ${powertools_base}/gflags-2.1.2-6.el8.x86_64.rpm && \ - apache_arrow_base=https://apache.jfrog.io/artifactory/arrow/almalinux/${major_version}/x86_64/Packages && \ - wget ${apache_arrow_base}/arrow11-libs-11.0.0-1.el8.x86_64.rpm && \ groonga_base=http://packages.groonga.org/almalinux/${major_version}/x86_64/Packages && \ wget ${groonga_base}/mysql-community-minimal-8.0-mroonga-13.01-1.el8.x86_64.rpm && \ wget ${groonga_base}/groonga-libs-13.0.1-1.el8.x86_64.rpm && \ wget ${groonga_base}/groonga-normalizer-mysql-1.2.1-1.el8.x86_64.rpm && \ - rpm -ivh ./*.rpm && \ + rpm -ivh ./*.rpm RUN mkdir -p /docker-entrypoint-mroonga-initdb.d && \ cp /usr/share/mroonga/install.sql \ From 35d0de52f8bc8cf1dd87d706d031433413a5a0be Mon Sep 17 00:00:00 2001 From: Horimoto Yasuhiro Date: Fri, 21 Apr 2023 12:12:39 +0900 Subject: [PATCH 05/19] Simplify --- mysql-8.0/Dockerfile | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/mysql-8.0/Dockerfile b/mysql-8.0/Dockerfile index c1cfba9..7fdfdb6 100644 --- a/mysql-8.0/Dockerfile +++ b/mysql-8.0/Dockerfile @@ -8,30 +8,20 @@ RUN mkdir -p /etc/mysql/mysql.conf.d && \ touch /etc/mysql/mysql.conf.d/default-auth-override.cnf && \ touch /etc/mysql/mysql.conf.d/lowercase-table-names.cnf && \ major_version=$(cut -d: -f5 /etc/system-release-cpe | grep -o "^[0-9]") && \ + microdnf install -y \ + wget && \ microdnf install -y \ epel-release && \ wget https://apache.jfrog.io/artifactory/arrow/almalinux/$(cut -d: -f5 /etc/system-release-cpe | cut -d. -f1)/apache-arrow-release-latest.rpm && \ rpm -Uvh apache-arrow-release-latest.rpm && \ sed -i'' -e '26d' /etc/pki/rpm-gpg/RPM-GPG-KEY-Apache-Arrow && \ + wget https://packages.groonga.org/almalinux/$(cut -d: -f5 /etc/system-release-cpe | cut -d. -f1)/groonga-release-latest.noarch.rpm && \ + rpm -Uvh groonga-release-latest.noarch.rpm && \ + microdnf install -y --enablerepo=ol$(cut -d: -f5 /etc/system-release-cpe | cut -d. -f1)_codeready_builder mysql-community-minimal-8.0-mroonga && \ microdnf install -y \ - wget && \ - microdnf install -y \ - arrow11-libs \ - cmake-filesystem \ - lz4 \ - msgpack \ - re2 \ - snappy \ - xxhash-libs && \ - powertools_base=https://repo.almalinux.org/almalinux/${major_version}/PowerTools/x86_64/os/Packages && \ - wget ${powertools_base}/glog-0.3.5-3.el8.x86_64.rpm && \ - wget ${powertools_base}/gflags-devel-2.1.2-6.el8.x86_64.rpm && \ - wget ${powertools_base}/gflags-2.1.2-6.el8.x86_64.rpm && \ - groonga_base=http://packages.groonga.org/almalinux/${major_version}/x86_64/Packages && \ - wget ${groonga_base}/mysql-community-minimal-8.0-mroonga-13.01-1.el8.x86_64.rpm && \ - wget ${groonga_base}/groonga-libs-13.0.1-1.el8.x86_64.rpm && \ - wget ${groonga_base}/groonga-normalizer-mysql-1.2.1-1.el8.x86_64.rpm && \ - rpm -ivh ./*.rpm + groonga-normalizer-mysql \ + groonga-tokenizer-mecab \ + mysql-community-minimal-8.0-mroonga && \ RUN mkdir -p /docker-entrypoint-mroonga-initdb.d && \ cp /usr/share/mroonga/install.sql \ From c6eb2e88adc0e3e9c89e13b8872b2fa47a09f678 Mon Sep 17 00:00:00 2001 From: Horimoto Yasuhiro Date: Fri, 21 Apr 2023 14:34:10 +0900 Subject: [PATCH 06/19] Enable groonga-almalinux repository Because Oracle Linux only use groonga-oracle-linux in default. --- mysql-8.0/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mysql-8.0/Dockerfile b/mysql-8.0/Dockerfile index 7fdfdb6..133988f 100644 --- a/mysql-8.0/Dockerfile +++ b/mysql-8.0/Dockerfile @@ -17,8 +17,9 @@ RUN mkdir -p /etc/mysql/mysql.conf.d && \ sed -i'' -e '26d' /etc/pki/rpm-gpg/RPM-GPG-KEY-Apache-Arrow && \ wget https://packages.groonga.org/almalinux/$(cut -d: -f5 /etc/system-release-cpe | cut -d. -f1)/groonga-release-latest.noarch.rpm && \ rpm -Uvh groonga-release-latest.noarch.rpm && \ - microdnf install -y --enablerepo=ol$(cut -d: -f5 /etc/system-release-cpe | cut -d. -f1)_codeready_builder mysql-community-minimal-8.0-mroonga && \ - microdnf install -y \ + microdnf install -y + --enablerepo=ol$(cut -d: -f5 /etc/system-release-cpe | cut -d. -f1)_codeready_builder \ + --enablerepo=groonga-almalinux \ groonga-normalizer-mysql \ groonga-tokenizer-mecab \ mysql-community-minimal-8.0-mroonga && \ From c93bce4225ff291bf300b28ffd3975372de1bca1 Mon Sep 17 00:00:00 2001 From: Horimoto Yasuhiro Date: Fri, 21 Apr 2023 14:39:05 +0900 Subject: [PATCH 07/19] Add a missing "\" --- mysql-8.0/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-8.0/Dockerfile b/mysql-8.0/Dockerfile index 133988f..12c58d2 100644 --- a/mysql-8.0/Dockerfile +++ b/mysql-8.0/Dockerfile @@ -17,7 +17,7 @@ RUN mkdir -p /etc/mysql/mysql.conf.d && \ sed -i'' -e '26d' /etc/pki/rpm-gpg/RPM-GPG-KEY-Apache-Arrow && \ wget https://packages.groonga.org/almalinux/$(cut -d: -f5 /etc/system-release-cpe | cut -d. -f1)/groonga-release-latest.noarch.rpm && \ rpm -Uvh groonga-release-latest.noarch.rpm && \ - microdnf install -y + microdnf install -y \ --enablerepo=ol$(cut -d: -f5 /etc/system-release-cpe | cut -d. -f1)_codeready_builder \ --enablerepo=groonga-almalinux \ groonga-normalizer-mysql \ From 355ba77a122f46255be70b86784b771ddb6d50e7 Mon Sep 17 00:00:00 2001 From: Horimoto Yasuhiro Date: Fri, 21 Apr 2023 14:48:49 +0900 Subject: [PATCH 08/19] Remove needless "&& \" --- mysql-8.0/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-8.0/Dockerfile b/mysql-8.0/Dockerfile index 12c58d2..1c163fa 100644 --- a/mysql-8.0/Dockerfile +++ b/mysql-8.0/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /etc/mysql/mysql.conf.d && \ --enablerepo=groonga-almalinux \ groonga-normalizer-mysql \ groonga-tokenizer-mecab \ - mysql-community-minimal-8.0-mroonga && \ + mysql-community-minimal-8.0-mroonga RUN mkdir -p /docker-entrypoint-mroonga-initdb.d && \ cp /usr/share/mroonga/install.sql \ From 51fdacba079e3ab12a04fe62fb00346c72cc9152 Mon Sep 17 00:00:00 2001 From: Horimoto Yasuhiro Date: Mon, 15 May 2023 15:51:04 +0900 Subject: [PATCH 09/19] Use the latest version --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 07ee8fa..7951a9a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,14 +49,14 @@ jobs: fi echo "::set-output name=push::${push}" echo "::set-output name=tags::${tags}" - - uses: actions/checkout@v2 - - uses: docker/login-action@v1 + - uses: actions/checkout@v3 + - uses: docker/login-action@v2 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - - uses: docker/setup-buildx-action@v1 + - uses: docker/setup-buildx-action@v2 id: buildx - - uses: docker/build-push-action@v2 + - uses: docker/build-push-action@v4 id: docker_build with: # cache-from: type=gha From 1b5161c42a39166cfac633dc2167f4b95d65be42 Mon Sep 17 00:00:00 2001 From: Horimoto Yasuhiro Date: Mon, 15 May 2023 15:51:20 +0900 Subject: [PATCH 10/19] Add a newly job for tesitng docker image --- .github/workflows/build.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7951a9a..421fb84 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,12 +43,14 @@ jobs: push=true ;; esac - tags="groonga/mroonga:${version}" + tag="groonga/mroonga:${version}" + tags="${tag}" if [ "${version}" = "mysql-5.7-latest" ]; then tags="${tags},groonga/mroonga:latest" fi echo "::set-output name=push::${push}" echo "::set-output name=tags::${tags}" + echo "TAG=${tag}" >> ${GITHUB_ENV} - uses: actions/checkout@v3 - uses: docker/login-action@v2 with: @@ -69,3 +71,17 @@ jobs: echo "ref: ${{ github.ref }}" echo "tags: ${{ steps.parse.outputs.tags }}" echo "digest: ${{ steps.docker_build.outputs.digest }}" + - uses: actions/checkout@v3 + with: + path: mroonga + repository: mroonga/mroonga + -name: Test + run: | + docker run \ + --name mroonga \ + -d \ + --volume ${PWD}:/host \ + ${{ env.TAG }} + + cd mroonga + docer exec mroonga /host/run-sql-test.sh From b2e6b07930bcdc320f81b76fac2aa80960418f9d Mon Sep 17 00:00:00 2001 From: Horimoto Yasuhiro Date: Mon, 15 May 2023 16:09:23 +0900 Subject: [PATCH 11/19] Remove a needless line --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 421fb84..fc659a6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,6 +82,5 @@ jobs: -d \ --volume ${PWD}:/host \ ${{ env.TAG }} - cd mroonga docer exec mroonga /host/run-sql-test.sh From 96a7ed350b61764c264e0e8d9941cea1764dfa10 Mon Sep 17 00:00:00 2001 From: Horimoto Yasuhiro Date: Mon, 15 May 2023 16:13:41 +0900 Subject: [PATCH 12/19] Debug --- .github/workflows/build.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fc659a6..0ccb61e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,16 +71,16 @@ jobs: echo "ref: ${{ github.ref }}" echo "tags: ${{ steps.parse.outputs.tags }}" echo "digest: ${{ steps.docker_build.outputs.digest }}" - - uses: actions/checkout@v3 - with: - path: mroonga - repository: mroonga/mroonga - -name: Test - run: | - docker run \ - --name mroonga \ - -d \ - --volume ${PWD}:/host \ - ${{ env.TAG }} - cd mroonga - docer exec mroonga /host/run-sql-test.sh +# - uses: actions/checkout@v3 +# with: +# path: mroonga +# repository: mroonga/mroonga +# -name: Test +# run: | +# docker run \ +# --name mroonga \ +# -d \ +# --volume ${PWD}:/host \ +# ${{ env.TAG }} +# cd mroonga +# docer exec mroonga /host/run-sql-test.sh From 41367ee7967faf75365b8c16371f48ebdba7dd79 Mon Sep 17 00:00:00 2001 From: Horimoto Yasuhiro Date: Mon, 15 May 2023 16:15:20 +0900 Subject: [PATCH 13/19] Enable checkout mroonga/mroonga --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ccb61e..5eb8216 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,10 +71,10 @@ jobs: echo "ref: ${{ github.ref }}" echo "tags: ${{ steps.parse.outputs.tags }}" echo "digest: ${{ steps.docker_build.outputs.digest }}" -# - uses: actions/checkout@v3 -# with: -# path: mroonga -# repository: mroonga/mroonga + - uses: actions/checkout@v3 + with: + path: mroonga + repository: mroonga/mroonga # -name: Test # run: | # docker run \ From 9151af3b15a59c1955d00ca8745d2b892ea0774b Mon Sep 17 00:00:00 2001 From: Horimoto Yasuhiro Date: Mon, 15 May 2023 16:16:50 +0900 Subject: [PATCH 14/19] Fix a typo --- .github/workflows/build.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5eb8216..f08f8c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,12 +75,12 @@ jobs: with: path: mroonga repository: mroonga/mroonga -# -name: Test -# run: | -# docker run \ -# --name mroonga \ -# -d \ -# --volume ${PWD}:/host \ -# ${{ env.TAG }} -# cd mroonga -# docer exec mroonga /host/run-sql-test.sh + - name: Test + run: | + docker run \ + --name mroonga \ + -d \ + --volume ${PWD}:/host \ + ${{ env.TAG }} + cd mroonga + docer exec mroonga /host/run-sql-test.sh From b2908aae96e5a775cea3ce4167240809825801c2 Mon Sep 17 00:00:00 2001 From: Horimoto Yasuhiro Date: Mon, 15 May 2023 16:21:28 +0900 Subject: [PATCH 15/19] Fix a typo --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f08f8c1..634e892 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -83,4 +83,4 @@ jobs: --volume ${PWD}:/host \ ${{ env.TAG }} cd mroonga - docer exec mroonga /host/run-sql-test.sh + docker exec mroonga /host/run-sql-test.sh From b72ed298d99b19a686559abe5d812ff03fe90804 Mon Sep 17 00:00:00 2001 From: Horimoto Yasuhiro Date: Mon, 15 May 2023 17:39:29 +0900 Subject: [PATCH 16/19] Fix a wrong path of a test script --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 634e892..46eca66 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -83,4 +83,4 @@ jobs: --volume ${PWD}:/host \ ${{ env.TAG }} cd mroonga - docker exec mroonga /host/run-sql-test.sh + docker exec mroonga /host/test/run-sql-test.sh From b46f46179a36137245e4daa741c1fc64fb409e67 Mon Sep 17 00:00:00 2001 From: Horimoto Yasuhiro Date: Thu, 10 Aug 2023 15:21:34 +0900 Subject: [PATCH 17/19] test: fix a wrong path for test script --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 46eca66..05b1266 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -83,4 +83,5 @@ jobs: --volume ${PWD}:/host \ ${{ env.TAG }} cd mroonga - docker exec mroonga /host/test/run-sql-test.sh + ls -al + docker exec mroonga test/run-sql-test.sh From e77e449034579073c48f435e48ba2b11ecf20f2c Mon Sep 17 00:00:00 2001 From: Horimoto Yasuhiro Date: Thu, 10 Aug 2023 15:46:04 +0900 Subject: [PATCH 18/19] Debug --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 05b1266..45459cf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -83,5 +83,6 @@ jobs: --volume ${PWD}:/host \ ${{ env.TAG }} cd mroonga - ls -al + ls -al test + pwd docker exec mroonga test/run-sql-test.sh From c585b1392d01fef269d457089509761f3205efd1 Mon Sep 17 00:00:00 2001 From: Horimoto Yasuhiro Date: Thu, 10 Aug 2023 16:13:48 +0900 Subject: [PATCH 19/19] Fix a wrong path --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 45459cf..f95f41b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -85,4 +85,4 @@ jobs: cd mroonga ls -al test pwd - docker exec mroonga test/run-sql-test.sh + docker exec mroonga ${PWD}/test/run-sql-test.sh