From 91f6f273d6d7a282626d1e2c3341b254f2cdd7c7 Mon Sep 17 00:00:00 2001 From: Yutaro Sakamoto Date: Fri, 9 Aug 2024 10:16:14 +0900 Subject: [PATCH 1/4] [Fix]: fix ci.yml * remove unnecessary environment variables and fix a typo * remove unnecessary dependencies --- .github/workflows/ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2b1dbbb..95dab74 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,9 +6,7 @@ on: types: [opened, reopened, review_requested, synchronize] env: - CPPFLAGS: "-I/usr/include" - LDFLAGS: "-L/usr/lib" - LD_LAIBRARY_PATH: "/usr/lib" + LD_LIBRARY_PATH: "/usr/lib" jobs: run-tests: @@ -18,7 +16,7 @@ jobs: - name: Install prerequisite softwares run: | sudo apt-get update -y - sudo apt-get install -y libncurses6 libncurses-dev ncurses-doc libgmp10 libgmp-dev m4 libtool help2man pkg-config gettext automake autoconf libxml2 libxml2-dev libxml2-utils libcjson1 libcjson-dev build-essential libdb-dev + sudo apt-get install -y libncurses-dev libgmp-dev m4 libtool help2man pkg-config gettext automake libxml2-dev libcjson-dev build-essential libdb-dev - uses: actions/checkout@v4 From e8990271a6aaedd715132d8271f45a424f5bc199 Mon Sep 17 00:00:00 2001 From: Yutaro Sakamoto Date: Fri, 9 Aug 2024 10:19:36 +0900 Subject: [PATCH 2/4] [Remove]: remove unnecessary code in cppcheck.yml --- .github/workflows/cppcheck.yml | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml index 7517444..d4937b8 100644 --- a/.github/workflows/cppcheck.yml +++ b/.github/workflows/cppcheck.yml @@ -5,11 +5,6 @@ on: pull_request: types: [opened, reopened, review_requested, synchronize] -env: - CPPFLAGS: "-I/usr/include" - LDFLAGS: "-L/usr/lib" - LD_LAIBRARY_PATH: "/usr/lib" - jobs: run-tests: runs-on: ubuntu-latest @@ -18,30 +13,10 @@ jobs: - name: Install prerequisite softwares run: | sudo apt-get update -y - sudo apt-get install -y libncurses6 libncurses-dev ncurses-doc libgmp10 libgmp-dev m4 libtool help2man pkg-config gettext automake autoconf libxml2 libxml2-dev libxml2-utils libcjson1 libcjson-dev build-essential libdb-dev cppcheck + sudo apt-get install -y cppcheck - uses: actions/checkout@v4 - - name: Download vbisam - run: | - if [ ! -d vbisam ]; then \ - git clone https://github.com/opensourcecobol/opensource-cobol; \ - mv opensource-cobol/vbisam .; \ - rm -rf opensource-cobol; \ - fi - - - name: Install vbisam - working-directory: vbisam - run: | - ./configure --prefix=/usr/ - make - sudo make install - - - name: Build GnuCOBOL - run: | - ./configure --prefix=/usr/ --with-xml2 --with-vbisam - make - - name: Check cobc/ working-directory: cobc/ run: ./cppcheck From dfe3a444e377ae4134101b6c48609ac7f0129f71 Mon Sep 17 00:00:00 2001 From: Yutaro Sakamoto Date: Fri, 9 Aug 2024 10:29:51 +0900 Subject: [PATCH 3/4] [Update]: change a job name in cppcheck.yml --- .github/workflows/cppcheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml index d4937b8..21474fc 100644 --- a/.github/workflows/cppcheck.yml +++ b/.github/workflows/cppcheck.yml @@ -6,7 +6,7 @@ on: types: [opened, reopened, review_requested, synchronize] jobs: - run-tests: + cppcheck: runs-on: ubuntu-latest steps: From 6836a28c5b3b76dd0bc03c08bb1c34a7306eeb2a Mon Sep 17 00:00:00 2001 From: Yutaro Sakamoto Date: Fri, 9 Aug 2024 10:33:20 +0900 Subject: [PATCH 4/4] [Remove]: remove all environment variables defined in ci.yml --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95dab74..37cde4d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,9 +5,6 @@ on: pull_request: types: [opened, reopened, review_requested, synchronize] -env: - LD_LIBRARY_PATH: "/usr/lib" - jobs: run-tests: runs-on: ubuntu-latest