From fb859e9812632b4fc2f16ecd179f1e62880f907c Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Tue, 6 Jun 2023 15:44:38 +0300 Subject: [PATCH 1/4] Enable Cobol [skip ci] --- .github/workflows/macos-test.yml | 4 ++-- tools/metacall-environment.sh | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index f18bc8716..61ef517c8 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -49,14 +49,14 @@ jobs: - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: - METACALL_INSTALL_OPTIONS: base python nodejs typescript java ruby wasm rpc file #netcore5 c cobol rust rapidjson funchook swig pack # clangformat v8rep51 coverage + METACALL_INSTALL_OPTIONS: base python nodejs typescript java ruby wasm rpc file cobol #netcore5 c rust rapidjson funchook swig pack # clangformat v8rep51 coverage - name: Configure run: | cd build bash ../tools/metacall-configure.sh $METACALL_CONFIGURE_OPTIONS env: - METACALL_CONFIGURE_OPTIONS: ${{ matrix.buildtype }} scripts ports tests sanitizer python nodejs typescript java ruby wasm rpc file # netcore5 c cobol rust examples install pack benchmarks # v8 coverage + METACALL_CONFIGURE_OPTIONS: ${{ matrix.buildtype }} scripts ports tests sanitizer python nodejs typescript java ruby wasm rpc file cobol # netcore5 c rust examples install pack benchmarks # v8 coverage - name: Build working-directory: ./build diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index c08ffbb91..f243f91b8 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -659,6 +659,8 @@ sub_cobol(){ # Runtime deps $SUDO_CMD apk add --no-cache db ncurses fi + elif [ "${OPERATIVE_SYSTEM}" = "Darwin" ]; then + brew install gnu-cobol fi } From f53a1467f36b4f45fda7f0e8b13e5332f8884d3e Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 19:50:14 +0300 Subject: [PATCH 2/4] SSH intro runner [skip ci] --- .github/workflows/macos-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index 61ef517c8..ae5801325 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,6 +46,9 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: From 3c10934b158952af2f5eac34aa6544b85b33938a Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 20:05:01 +0300 Subject: [PATCH 3/4] Fix cobol paths [skip ci] --- tools/metacall-environment.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index f243f91b8..1b565177c 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -661,6 +661,12 @@ sub_cobol(){ fi elif [ "${OPERATIVE_SYSTEM}" = "Darwin" ]; then brew install gnu-cobol + mkdir -p build + CMAKE_CONFIG_PATH="$ROOT_DIR/build/CMakeConfig.txt" + COBOL_PREFIX=$(brew --prefix gnu-cobol) + echo "-DCOBOL_EXECUTABLE=${COBOL_PREFIX}/bin/cobc" >> $CMAKE_CONFIG_PATH + echo "-DCOBOL_INCLUDE_DIR=${COBOL_PREFIX}/include" >> $CMAKE_CONFIG_PATH + echo "-DCOBOL_LIBRARY=${COBOL_PREFIX}/lib/libcob.dylib" >> $CMAKE_CONFIG_PATH fi } From 983647d72470a460c0134cceb9a1bca2e978d202 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 20:08:14 +0300 Subject: [PATCH 4/4] Fix cobol paths [skip ci] --- .github/workflows/macos-test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index ae5801325..61ef517c8 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,9 +46,6 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: