From 3519d4a6d1716f1444f925fd83257c6929cfa913 Mon Sep 17 00:00:00 2001 From: tsh-hashimoto Date: Wed, 25 Jun 2025 16:49:12 +0900 Subject: [PATCH 1/4] ci: fix ci.yml enable vbisam-osscons-patch instead of opensourcecobol/vbisam --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 49c1f94..c8dca6b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,15 +48,15 @@ jobs: - name: Download vbisam and Build it if: steps.vbisam_cache_id.outputs.cache-hit != 'true' run: | - curl -L -o opensource-cobol-1.5.2J.tar.gz https://github.com/opensourcecobol/opensource-cobol/archive/refs/tags/v1.5.2J.tar.gz - tar zxf opensource-cobol-1.5.2J.tar.gz - cd opensource-cobol-1.5.2J/vbisam + curl -L -o vbisam-osscons-patch-2.0patch1.tar.gz https://github.com/opensourcecobol/vbisam-osscons-patch/archive/refs/tags/v2.0patch1.tar.gz + tar zxf vbisam-osscons-patch-2.0patch1.tar.gz + cd vbisam-osscons-patch-2.0patch1 ./configure --prefix=/usr/ make # Install vbisam - name: Install vbisam - working-directory: opensource-cobol-1.5.2J/vbisam + working-directory: vbisam-osscons-patch-2.0patch1 run: | make install From 1eb0bf0b8f4078b1244f2cfe9599d4cc94bf9256 Mon Sep 17 00:00:00 2001 From: tsh-hashimoto Date: Wed, 25 Jun 2025 17:04:29 +0900 Subject: [PATCH 2/4] fix ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c8dca6b..f1277df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,12 +36,12 @@ jobs: - uses: actions/checkout@v4 - # Cache the directory 'opensource-cobol-1.5.2J/vbisam' + # Cache the directory 'vbisam' - name: Cache vbisam id: vbisam_cache_id uses: actions/cache@v4 with: - path: opensource-cobol/vbisam + path: vbisam-osscons-patch-2.0patch1 key: vbisam-${{ matrix.os }}-key # Download vbisam and Build it From b9d9129a01cab9f3a9a85a70e1eb9311df14cf7e Mon Sep 17 00:00:00 2001 From: tsh-hashimoto Date: Thu, 26 Jun 2025 09:34:53 +0900 Subject: [PATCH 3/4] ci: fix cppcheck.yml --- .github/workflows/cppcheck.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml index 7517444..51ca926 100644 --- a/.github/workflows/cppcheck.yml +++ b/.github/workflows/cppcheck.yml @@ -25,13 +25,12 @@ jobs: - name: Download vbisam run: | if [ ! -d vbisam ]; then \ - git clone https://github.com/opensourcecobol/opensource-cobol; \ - mv opensource-cobol/vbisam .; \ - rm -rf opensource-cobol; \ + git clone https://github.com/opensourcecobol/vbisam-osscons-patch.git; \ + mv vbisam-osscons-patch .; \ fi - name: Install vbisam - working-directory: vbisam + working-directory: vbisam-osscons-patch run: | ./configure --prefix=/usr/ make From b088813fd295041c0eb04a7d6e6ea56ea8b6e51b Mon Sep 17 00:00:00 2001 From: tsh-hashimoto Date: Thu, 26 Jun 2025 09:38:16 +0900 Subject: [PATCH 4/4] fix cppcheck.yml --- .github/workflows/cppcheck.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml index 51ca926..79ea8dc 100644 --- a/.github/workflows/cppcheck.yml +++ b/.github/workflows/cppcheck.yml @@ -24,9 +24,8 @@ jobs: - name: Download vbisam run: | - if [ ! -d vbisam ]; then \ + if [ ! -d vbisam-osscons-patch ]; then \ git clone https://github.com/opensourcecobol/vbisam-osscons-patch.git; \ - mv vbisam-osscons-patch .; \ fi - name: Install vbisam