From d7fb4df040af059dbb92e634304c4194de69a65a Mon Sep 17 00:00:00 2001 From: davidot Date: Tue, 25 Oct 2022 18:40:28 +0200 Subject: [PATCH 01/30] Print some versions to check coq is installed --- .github/workflows/MacOs_8.15.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml index 87788f2..cd5036c 100644 --- a/.github/workflows/MacOs_8.15.yml +++ b/.github/workflows/MacOs_8.15.yml @@ -99,6 +99,7 @@ jobs: run: | opam install -y coq-serapi opam install -y coq-coquelicot + - name: Install system utilities shell: bash @@ -120,6 +121,8 @@ jobs: run: | brew install expat libxml2 opam install -y coqide + coqc -v || : + coq_makefile -v || : - name: Checking glib directory and compiling? shell: bash @@ -146,6 +149,8 @@ jobs: run: | git clone https://github.com/impermeable/coq-waterproof cd coq-waterproof + make --version + coqc -v || : make make install cd .. From 2dca380c21066a4f7ce30a560718c850d9933800 Mon Sep 17 00:00:00 2001 From: davidot Date: Tue, 25 Oct 2022 18:41:39 +0200 Subject: [PATCH 02/30] Run on all branches --- .github/workflows/MacOs_8.15.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml index cd5036c..11c0a76 100644 --- a/.github/workflows/MacOs_8.15.yml +++ b/.github/workflows/MacOs_8.15.yml @@ -5,9 +5,7 @@ name: MacOS # Controls when the workflow will run on: # Triggers the workflow on push or pull request events but only for the main branch - push: - branches: - - macos + push # Allows you to run this workflow manually from the Actions tab workflow_dispatch: From 6c07c98c870ce3d9e98f008f752803836ff5364b Mon Sep 17 00:00:00 2001 From: davidot Date: Tue, 25 Oct 2022 18:42:45 +0200 Subject: [PATCH 03/30] Fix syntax error --- .github/workflows/MacOs_8.15.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml index 11c0a76..beb0115 100644 --- a/.github/workflows/MacOs_8.15.yml +++ b/.github/workflows/MacOs_8.15.yml @@ -1,11 +1,10 @@ # This is a basic workflow to help you get started with Actions - -name: MacOS +name: MacOS-2 # Controls when the workflow will run on: # Triggers the workflow on push or pull request events but only for the main branch - push + push: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: From 6a15d777b840da049c63992560298161065a9d4b Mon Sep 17 00:00:00 2001 From: M-J-V Date: Tue, 25 Oct 2022 19:21:18 +0200 Subject: [PATCH 04/30] Check /usr/local/Cellar --- .github/workflows/MacOs_8.15.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml index beb0115..8e39060 100644 --- a/.github/workflows/MacOs_8.15.yml +++ b/.github/workflows/MacOs_8.15.yml @@ -130,11 +130,11 @@ jobs: pwd ls - # - name: find opam coq - # shell: bash - # run: | - # cd /usr/local/bin/Cellar - # tree -a opam + - name: find opam coq + shell: bash + run: | + cd /usr/local/Cellar + tree -a opam - name: Check PATH shell: bash From 25d0c9cb697048e2316b6a5ce78de7c5a3e026bb Mon Sep 17 00:00:00 2001 From: davidot Date: Tue, 25 Oct 2022 19:30:35 +0200 Subject: [PATCH 05/30] Use the opam env after installing --- .github/workflows/MacOs_8.15.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml index 8e39060..b2e925e 100644 --- a/.github/workflows/MacOs_8.15.yml +++ b/.github/workflows/MacOs_8.15.yml @@ -118,6 +118,7 @@ jobs: run: | brew install expat libxml2 opam install -y coqide + eval $(opam env) coqc -v || : coq_makefile -v || : From ec379fe54d05f593e56ca615b70c917ee6bfe2c9 Mon Sep 17 00:00:00 2001 From: M-J-V Date: Tue, 25 Oct 2022 21:35:17 +0200 Subject: [PATCH 06/30] use opem env after installing --- .github/workflows/MacOs_8.15.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml index b2e925e..fb35a57 100644 --- a/.github/workflows/MacOs_8.15.yml +++ b/.github/workflows/MacOs_8.15.yml @@ -134,6 +134,7 @@ jobs: - name: find opam coq shell: bash run: | + brew install tree cd /usr/local/Cellar tree -a opam From 878708478d6b164b62b9c3d3da7e68d42ddce499 Mon Sep 17 00:00:00 2001 From: davidot Date: Tue, 25 Oct 2022 23:04:47 +0200 Subject: [PATCH 07/30] Active env in the right step --- .github/workflows/MacOs_8.15.yml | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml index fb35a57..dae4afe 100644 --- a/.github/workflows/MacOs_8.15.yml +++ b/.github/workflows/MacOs_8.15.yml @@ -118,25 +118,6 @@ jobs: run: | brew install expat libxml2 opam install -y coqide - eval $(opam env) - coqc -v || : - coq_makefile -v || : - - - name: Checking glib directory and compiling? - shell: bash - run: | - pwd - cd /usr/local/share/glib-2.0/schemas - glib-compile-schemas . - pwd - ls - - - name: find opam coq - shell: bash - run: | - brew install tree - cd /usr/local/Cellar - tree -a opam - name: Check PATH shell: bash @@ -149,6 +130,7 @@ jobs: git clone https://github.com/impermeable/coq-waterproof cd coq-waterproof make --version + eval $(opam env) coqc -v || : make make install From 76c994f1af432c16294304dd486ade025c554b6b Mon Sep 17 00:00:00 2001 From: davidot Date: Tue, 25 Oct 2022 23:59:51 +0200 Subject: [PATCH 08/30] Use the env even more --- .github/workflows/MacOs_8.15.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml index dae4afe..07fb838 100644 --- a/.github/workflows/MacOs_8.15.yml +++ b/.github/workflows/MacOs_8.15.yml @@ -141,6 +141,8 @@ jobs: shell: bash run: | cd main + opam switch coq_for_waterproof + eval $(opam env) chmod +x install_packages_macos.sh ./install_packages_macos.sh packages_macos.cfg @@ -148,19 +150,11 @@ jobs: shell: bash run: | cd platform - pwd - ls opam switch coq_for_waterproof + eval $(opam env) chmod +x macos/create_installer_macos.sh ./macos/create_installer_macos.sh -q - - name: Check install - shell: bash - run: | - cd platform/macos_installer - pwd - ls - - name: 'Upload Artifact' if: always() uses: actions/upload-artifact@v2 From 6803dad1ac4e8ba9255bc8a300923987bd05f0bd Mon Sep 17 00:00:00 2001 From: davidot Date: Wed, 26 Oct 2022 01:13:12 +0200 Subject: [PATCH 09/30] Print out what we have installed --- .github/workflows/MacOs_8.15.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml index 07fb838..9ff3e56 100644 --- a/.github/workflows/MacOs_8.15.yml +++ b/.github/workflows/MacOs_8.15.yml @@ -136,6 +136,13 @@ jobs: make install cd .. rm -rf coq-waterproof + ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib + ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib + ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib/Waterproof// || : + ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof/ || : + ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof// || : + ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib/Waterproof/ || : + - name: Install packages from cfg and add to installer shell: bash @@ -145,6 +152,12 @@ jobs: eval $(opam env) chmod +x install_packages_macos.sh ./install_packages_macos.sh packages_macos.cfg + ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib + ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib + ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib/Waterproof// || : + ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof/ || : + ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof// || : + ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib/Waterproof/ || : - name: Create installer (original) shell: bash @@ -152,6 +165,12 @@ jobs: cd platform opam switch coq_for_waterproof eval $(opam env) + ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib + ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib + ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib/Waterproof// || : + ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof/ || : + ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof// || : + ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib/Waterproof/ || : chmod +x macos/create_installer_macos.sh ./macos/create_installer_macos.sh -q From a5819f9aef6e295610a7e4d85799dc7026861bc0 Mon Sep 17 00:00:00 2001 From: M-J-V Date: Wed, 26 Oct 2022 01:24:56 +0200 Subject: [PATCH 10/30] Test Installer with Waterproof Static dir --- install_packages_macos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_packages_macos.sh b/install_packages_macos.sh index e9ba41d..837fc3f 100644 --- a/install_packages_macos.sh +++ b/install_packages_macos.sh @@ -70,7 +70,7 @@ grep -v '^#' $config_file | while read -r line ; do # Inject install code into installer script # Only testing that add_folder_recursively works, update later - sed -i '/^source "${HERE}".*/a add_folder_recursively "lib/coq/user-contrib/" "Waterproof" ' ../platform/macos/create_installer_macos.sh + sed -i '/^source "${HERE}".*/a add_folder_recursively "~/.opam/coq_for_waterproof/lib/coq/user-contrib/" "Waterproof" ' ../platform/macos/create_installer_macos.sh elif [[ $line =~ ^OPAM* ]] ; then opam install -y $package_name fi From f96091c611e27ffa5dfc4c039979af99e62cd145 Mon Sep 17 00:00:00 2001 From: M-J-V Date: Wed, 26 Oct 2022 02:31:45 +0200 Subject: [PATCH 11/30] Test Installer with Waterproof Static dir (single /) --- install_packages_macos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_packages_macos.sh b/install_packages_macos.sh index 837fc3f..09fa006 100644 --- a/install_packages_macos.sh +++ b/install_packages_macos.sh @@ -70,7 +70,7 @@ grep -v '^#' $config_file | while read -r line ; do # Inject install code into installer script # Only testing that add_folder_recursively works, update later - sed -i '/^source "${HERE}".*/a add_folder_recursively "~/.opam/coq_for_waterproof/lib/coq/user-contrib/" "Waterproof" ' ../platform/macos/create_installer_macos.sh + sed -i '/^source "${HERE}".*/a add_folder_recursively "~/.opam/coq_for_waterproof/lib/coq/user-contrib" "Waterproof" ' ../platform/macos/create_installer_macos.sh elif [[ $line =~ ^OPAM* ]] ; then opam install -y $package_name fi From 0537d590048444525c2f72bc1b9a47312d775319 Mon Sep 17 00:00:00 2001 From: M-J-V Date: Wed, 26 Oct 2022 02:33:08 +0200 Subject: [PATCH 12/30] Test Installer with Waterproof Static dir (Full dir) --- install_packages_macos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_packages_macos.sh b/install_packages_macos.sh index 09fa006..d621978 100644 --- a/install_packages_macos.sh +++ b/install_packages_macos.sh @@ -70,7 +70,7 @@ grep -v '^#' $config_file | while read -r line ; do # Inject install code into installer script # Only testing that add_folder_recursively works, update later - sed -i '/^source "${HERE}".*/a add_folder_recursively "~/.opam/coq_for_waterproof/lib/coq/user-contrib" "Waterproof" ' ../platform/macos/create_installer_macos.sh + sed -i '/^source "${HERE}".*/a add_folder_recursively "/Users/runner/.opam/coq_for_waterproof/lib/coq//user-contrib/" "Waterproof" ' ../platform/macos/create_installer_macos.sh elif [[ $line =~ ^OPAM* ]] ; then opam install -y $package_name fi From ac97c85217147e88b1f9688c239ec0a48977f770 Mon Sep 17 00:00:00 2001 From: M-J-V Date: Wed, 26 Oct 2022 02:33:50 +0200 Subject: [PATCH 13/30] Test Installer with Waterproof Static dir (single / + full dir) --- install_packages_macos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_packages_macos.sh b/install_packages_macos.sh index d621978..3ae51da 100644 --- a/install_packages_macos.sh +++ b/install_packages_macos.sh @@ -70,7 +70,7 @@ grep -v '^#' $config_file | while read -r line ; do # Inject install code into installer script # Only testing that add_folder_recursively works, update later - sed -i '/^source "${HERE}".*/a add_folder_recursively "/Users/runner/.opam/coq_for_waterproof/lib/coq//user-contrib/" "Waterproof" ' ../platform/macos/create_installer_macos.sh + sed -i '/^source "${HERE}".*/a add_folder_recursively "/Users/runner/.opam/coq_for_waterproof/lib/coq/user-contrib" "Waterproof" ' ../platform/macos/create_installer_macos.sh elif [[ $line =~ ^OPAM* ]] ; then opam install -y $package_name fi From 07455d8597a2e2a5bdab27fad516630a8508e194 Mon Sep 17 00:00:00 2001 From: M-J-V Date: Wed, 26 Oct 2022 02:35:45 +0200 Subject: [PATCH 14/30] Update coq 8.15 cache with Waterproof --- .github/workflows/MacOs_8.15.yml | 44 ++++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml index 9ff3e56..d5840b6 100644 --- a/.github/workflows/MacOs_8.15.yml +++ b/.github/workflows/MacOs_8.15.yml @@ -40,14 +40,14 @@ jobs: repository: coq/platform path: platform - # - name: Cache opam/coq - # id: cache-opam - # uses: actions/cache@v3 - # env: - # cache-name: cache-opam-modules - # with: - # path: ~/.opam - # key: ${{ runner.os }}-build-${{ env.cache-name }}-8.15 + - name: Cache opam/coq + id: cache-opam + uses: actions/cache@v3 + env: + cache-name: cache-opam-modules + with: + path: ~/.opam + key: ${{ runner.os }}-build-${{ env.cache-name }}-8.15-Waterproof - name: Install homebrew and make shell: bash @@ -159,20 +159,20 @@ jobs: ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof// || : ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib/Waterproof/ || : - - name: Create installer (original) - shell: bash - run: | - cd platform - opam switch coq_for_waterproof - eval $(opam env) - ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib - ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib - ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib/Waterproof// || : - ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof/ || : - ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof// || : - ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib/Waterproof/ || : - chmod +x macos/create_installer_macos.sh - ./macos/create_installer_macos.sh -q + # - name: Create installer (original) + # shell: bash + # run: | + # cd platform + # opam switch coq_for_waterproof + # eval $(opam env) + # ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib + # ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib + # ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib/Waterproof// || : + # ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof/ || : + # ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof// || : + # ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib/Waterproof/ || : + # chmod +x macos/create_installer_macos.sh + # ./macos/create_installer_macos.sh -q - name: 'Upload Artifact' if: always() From dec8cf8333c9a7a03d4ea4f3ed0a482406bfcf21 Mon Sep 17 00:00:00 2001 From: M-J-V Date: Wed, 26 Oct 2022 11:13:15 +0200 Subject: [PATCH 15/30] Add 'add_folder_recursivley' to more appropriate line --- install_packages_macos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_packages_macos.sh b/install_packages_macos.sh index 3ae51da..d11408f 100644 --- a/install_packages_macos.sh +++ b/install_packages_macos.sh @@ -70,7 +70,7 @@ grep -v '^#' $config_file | while read -r line ; do # Inject install code into installer script # Only testing that add_folder_recursively works, update later - sed -i '/^source "${HERE}".*/a add_folder_recursively "/Users/runner/.opam/coq_for_waterproof/lib/coq/user-contrib" "Waterproof" ' ../platform/macos/create_installer_macos.sh + sed -i '/^add_folder_recursively "${PKG_MANAGER_ROOT}".*/a add_folder_recursively "/Users/runner/.opam/coq_for_waterproof/lib/coq/user-contrib" "Waterproof" ' ../platform/macos/create_installer_macos.sh elif [[ $line =~ ^OPAM* ]] ; then opam install -y $package_name fi From 17b6148cb80bb408ed3d12fa05375d0b93e905dc Mon Sep 17 00:00:00 2001 From: M-J-V Date: Wed, 26 Oct 2022 11:36:30 +0200 Subject: [PATCH 16/30] add_folder_recursivley more appropriate line, waterproof from script --- .github/workflows/MacOs_8.15.yml | 74 ++++++++++++++++---------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml index d5840b6..4197a04 100644 --- a/.github/workflows/MacOs_8.15.yml +++ b/.github/workflows/MacOs_8.15.yml @@ -40,14 +40,14 @@ jobs: repository: coq/platform path: platform - - name: Cache opam/coq - id: cache-opam - uses: actions/cache@v3 - env: - cache-name: cache-opam-modules - with: - path: ~/.opam - key: ${{ runner.os }}-build-${{ env.cache-name }}-8.15-Waterproof + # - name: Cache opam/coq + # id: cache-opam + # uses: actions/cache@v3 + # env: + # cache-name: cache-opam-modules + # with: + # path: ~/.opam + # key: ${{ runner.os }}-build-${{ env.cache-name }}-8.15-Waterproof - name: Install homebrew and make shell: bash @@ -124,55 +124,55 @@ jobs: run: | echo $PATH - - name: Install Waterproof library + # - name: Install Waterproof library + # shell: bash + # run: | + # git clone https://github.com/impermeable/coq-waterproof + # cd coq-waterproof + # make --version + # eval $(opam env) + # coqc -v || : + # make + # make install + # cd .. + # rm -rf coq-waterproof + # ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib + # ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib + # ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib/Waterproof// || : + # ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof/ || : + # ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof// || : + # ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib/Waterproof/ || : + + + - name: Install packages from cfg and add to installer shell: bash run: | - git clone https://github.com/impermeable/coq-waterproof - cd coq-waterproof - make --version + cd main + opam switch coq_for_waterproof eval $(opam env) - coqc -v || : - make - make install - cd .. - rm -rf coq-waterproof + chmod +x install_packages_macos.sh + ./install_packages_macos.sh packages_macos.cfg ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib/Waterproof// || : ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof/ || : ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof// || : ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib/Waterproof/ || : - - - name: Install packages from cfg and add to installer + - name: Create installer (original) shell: bash run: | - cd main + cd platform opam switch coq_for_waterproof eval $(opam env) - chmod +x install_packages_macos.sh - ./install_packages_macos.sh packages_macos.cfg ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib/Waterproof// || : ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof/ || : ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof// || : ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib/Waterproof/ || : - - # - name: Create installer (original) - # shell: bash - # run: | - # cd platform - # opam switch coq_for_waterproof - # eval $(opam env) - # ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib - # ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib - # ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib/Waterproof// || : - # ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof/ || : - # ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof// || : - # ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib/Waterproof/ || : - # chmod +x macos/create_installer_macos.sh - # ./macos/create_installer_macos.sh -q + chmod +x macos/create_installer_macos.sh + ./macos/create_installer_macos.sh -q - name: 'Upload Artifact' if: always() From f7c705a73bad952e74341003dbc21ae69faff762 Mon Sep 17 00:00:00 2001 From: M-J-V Date: Wed, 26 Oct 2022 12:09:44 +0200 Subject: [PATCH 17/30] Build Installer for coq 8.14 --- .github/workflows/MacOs_8.14.yml | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/.github/workflows/MacOs_8.14.yml b/.github/workflows/MacOs_8.14.yml index 4f91b93..e9f4f82 100644 --- a/.github/workflows/MacOs_8.14.yml +++ b/.github/workflows/MacOs_8.14.yml @@ -1,17 +1,11 @@ # This is a basic workflow to help you get started with Actions -name: MacOS +name: MacOS-8.14 # Controls when the workflow will run -# on: -# # Triggers the workflow on push or pull request events but only for the main branch -# push: -# branches: -# - macos - -# pull_request: -# branches: -# - '**' +on: + # Triggers the workflow on push or pull request events but only for the main branch + push: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -97,6 +91,7 @@ jobs: chmod +x coq_platform_make.sh ./coq_platform_make.sh -extent=b -parallel=p -jobs=2 -vst=n -compcert=n -pick="8.14~2022.01" -set-switch=y opam init + eval $(opam env) - if: ${{ steps.cache-opam.outputs.cache-hit != 'true' }} name: Install serapi @@ -110,17 +105,6 @@ jobs: run: | brew install coq -# - name: Install Waterproof library -# shell: bash -# run: | -# cd platform -# git clone https://github.com/impermeable/coq-waterproof -# cd coq-waterproof -# make -# make install -# cd .. -# rm -rf coq-waterproof - - name: Install system utilities shell: bash run: | @@ -155,6 +139,7 @@ jobs: shell: bash run: | cd main + eval $(opam env) chmod +x install_packages_macos.sh ./install_packages_macos.sh packages_macos.cfg @@ -164,6 +149,7 @@ jobs: cd platform pwd ls + eval $(opam env) opam switch coq_for_waterproof chmod +x macos/create_installer_macos.sh ./macos/create_installer_macos.sh -q From 99582c19f438bf4cee9692598245403108662963 Mon Sep 17 00:00:00 2001 From: M-J-V Date: Wed, 26 Oct 2022 12:34:28 +0200 Subject: [PATCH 18/30] Check opam coq version --- .github/workflows/MacOs_8.14.yml | 2 +- .github/workflows/MacOs_8.15.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/MacOs_8.14.yml b/.github/workflows/MacOs_8.14.yml index e9f4f82..3fe5453 100644 --- a/.github/workflows/MacOs_8.14.yml +++ b/.github/workflows/MacOs_8.14.yml @@ -148,8 +148,8 @@ jobs: run: | cd platform pwd - ls eval $(opam env) + opm info opam switch coq_for_waterproof chmod +x macos/create_installer_macos.sh ./macos/create_installer_macos.sh -q diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml index 4197a04..3458f93 100644 --- a/.github/workflows/MacOs_8.15.yml +++ b/.github/workflows/MacOs_8.15.yml @@ -163,6 +163,7 @@ jobs: shell: bash run: | cd platform + opam info opam switch coq_for_waterproof eval $(opam env) ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib From 8265bee9c762e0b01461eccd8657fe1c032457d2 Mon Sep 17 00:00:00 2001 From: M-J-V Date: Wed, 26 Oct 2022 14:08:44 +0200 Subject: [PATCH 19/30] Check opam package versions --- .github/workflows/MacOs_8.14.yml | 15 +++++---------- .github/workflows/MacOs_8.15.yml | 15 ++++++--------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/.github/workflows/MacOs_8.14.yml b/.github/workflows/MacOs_8.14.yml index 3fe5453..02caf66 100644 --- a/.github/workflows/MacOs_8.14.yml +++ b/.github/workflows/MacOs_8.14.yml @@ -3,12 +3,12 @@ name: MacOS-8.14 # Controls when the workflow will run -on: - # Triggers the workflow on push or pull request events but only for the main branch - push: +# on: +# # Triggers the workflow on push or pull request events but only for the main branch +# push: - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: +# # Allows you to run this workflow manually from the Actions tab +# workflow_dispatch: ############################################################################### # Platform script options shared among all jobs @@ -100,11 +100,6 @@ jobs: opam install -y coq-serapi opam install -y coq-coquelicot - - name: Install coq (Guarantee check) - shell: bash - run: | - brew install coq - - name: Install system utilities shell: bash run: | diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml index 3458f93..65c5d12 100644 --- a/.github/workflows/MacOs_8.15.yml +++ b/.github/workflows/MacOs_8.15.yml @@ -119,10 +119,14 @@ jobs: brew install expat libxml2 opam install -y coqide - - name: Check PATH + - name: Check versions shell: bash run: | - echo $PATH + eval $(opam env) + opam show coq + opam show coq-serapi + opam show coq-coquelicot + opam show coq-ide # - name: Install Waterproof library # shell: bash @@ -163,15 +167,8 @@ jobs: shell: bash run: | cd platform - opam info opam switch coq_for_waterproof eval $(opam env) - ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib - ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib - ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib/Waterproof// || : - ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof/ || : - ls ~/.opam/coq_for_waterproof/lib/coq//user-contrib//Waterproof// || : - ls ~/.opam/coq_for_waterproof/lib/coq/user-contrib/Waterproof/ || : chmod +x macos/create_installer_macos.sh ./macos/create_installer_macos.sh -q From 5c938208386be8e426d57a42e9c72df4460211ee Mon Sep 17 00:00:00 2001 From: M-J-V Date: Wed, 26 Oct 2022 14:10:34 +0200 Subject: [PATCH 20/30] Remove unecessary installs --- .github/workflows/MacOs_8.15.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml index 65c5d12..6fb594e 100644 --- a/.github/workflows/MacOs_8.15.yml +++ b/.github/workflows/MacOs_8.15.yml @@ -113,20 +113,20 @@ jobs: brew install adwaita-icon-theme brew install gtksourceview3 - - name: Opam install coq-ide - shell: bash - run: | - brew install expat libxml2 - opam install -y coqide + # - name: Opam install coq-ide + # shell: bash + # run: | + # brew install expat libxml2 + # opam install -y coqide - - name: Check versions - shell: bash - run: | - eval $(opam env) - opam show coq - opam show coq-serapi - opam show coq-coquelicot - opam show coq-ide + # - name: Check versions + # shell: bash + # run: | + # eval $(opam env) + # opam show coq + # opam show coq-serapi + # opam show coq-coquelicot + # opam show coq-ide # - name: Install Waterproof library # shell: bash From 626a7033709ddb13fe83f6d7d9927bada2dbe481 Mon Sep 17 00:00:00 2001 From: M-J-V Date: Wed, 26 Oct 2022 14:20:34 +0200 Subject: [PATCH 21/30] Opma install correct versions --- .github/workflows/MacOs_8.15.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml index 6fb594e..8b0911e 100644 --- a/.github/workflows/MacOs_8.15.yml +++ b/.github/workflows/MacOs_8.15.yml @@ -94,9 +94,8 @@ jobs: name: Install serapi shell: bash run: | - opam install -y coq-serapi + opam install -y coq-serapi.8.15.0+0.15.2 opam install -y coq-coquelicot - - name: Install system utilities shell: bash @@ -113,11 +112,11 @@ jobs: brew install adwaita-icon-theme brew install gtksourceview3 - # - name: Opam install coq-ide - # shell: bash - # run: | - # brew install expat libxml2 - # opam install -y coqide + - name: Opam install coq-ide + shell: bash + run: | + brew install expat libxml2 + opam install -y coqide.8.15.2 # - name: Check versions # shell: bash From e5eece2da30508b6a31a485efd892b8d9acbba16 Mon Sep 17 00:00:00 2001 From: M-J-V Date: Wed, 26 Oct 2022 14:23:05 +0200 Subject: [PATCH 22/30] Opam install correct versions --- .github/workflows/MacOs_8.15.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml index 8b0911e..1caf2c9 100644 --- a/.github/workflows/MacOs_8.15.yml +++ b/.github/workflows/MacOs_8.15.yml @@ -95,7 +95,7 @@ jobs: shell: bash run: | opam install -y coq-serapi.8.15.0+0.15.2 - opam install -y coq-coquelicot + opam install -y coq-coquelicot.3.2.0 - name: Install system utilities shell: bash From 0e9c7a97055ceb335ac28b71cf4a9e6bc3ff0a14 Mon Sep 17 00:00:00 2001 From: M-J-V Date: Tue, 1 Nov 2022 09:27:29 +0100 Subject: [PATCH 23/30] Rerun Dependencies coq8.15 --- install_packages_macos.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/install_packages_macos.sh b/install_packages_macos.sh index d11408f..213df31 100644 --- a/install_packages_macos.sh +++ b/install_packages_macos.sh @@ -82,7 +82,4 @@ rmdir github_packages # Inject install imports into create installer script #sed -i '/^source "${HERE}"/shell_scripts/installer_create_tree.sh/a source add_custom_macos.sh' platform/macos/create_installer_macos.sh # Custom package functions -# Unneccesary? -#sed -i '/^###### Create the NSIS installer #####/a source unselect_packages.sh' platform/macos/create_installer_macos.sh # Unselect package functions - cat ../platform/macos/create_installer_macos.sh \ No newline at end of file From e11e9369074e1b744f2faec664df3b7c913781fd Mon Sep 17 00:00:00 2001 From: davidot Date: Tue, 1 Nov 2022 09:42:02 +0100 Subject: [PATCH 24/30] Don't use the new macos image just yet --- .github/workflows/MacOs_8.15.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml index 1caf2c9..f355a37 100644 --- a/.github/workflows/MacOs_8.15.yml +++ b/.github/workflows/MacOs_8.15.yml @@ -20,7 +20,7 @@ jobs: # This workflow contains a single job called "build" Ubuntu_platform: name: MacOS - runs-on: macos-latest + runs-on: macos-11 # Steps represent a sequence of tasks that will be executed as part of the job steps: From dfe846d60092f0dc612f570c5f3fe4932295b148 Mon Sep 17 00:00:00 2001 From: M-J-V Date: Wed, 2 Nov 2022 09:44:11 +0100 Subject: [PATCH 25/30] Create Installer for Mac-10.15 --- .github/workflows/MacOs_8.15.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml index f355a37..de36abc 100644 --- a/.github/workflows/MacOs_8.15.yml +++ b/.github/workflows/MacOs_8.15.yml @@ -20,7 +20,7 @@ jobs: # This workflow contains a single job called "build" Ubuntu_platform: name: MacOS - runs-on: macos-11 + runs-on: macos-10.15 # Steps represent a sequence of tasks that will be executed as part of the job steps: From 846bd674f1e13c2be4116338214c1052df31d589 Mon Sep 17 00:00:00 2001 From: M-J-V Date: Thu, 3 Nov 2022 15:01:08 +0100 Subject: [PATCH 26/30] Change Waterproof dir in installer --- install_packages_macos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_packages_macos.sh b/install_packages_macos.sh index 213df31..c9f2c45 100644 --- a/install_packages_macos.sh +++ b/install_packages_macos.sh @@ -70,7 +70,7 @@ grep -v '^#' $config_file | while read -r line ; do # Inject install code into installer script # Only testing that add_folder_recursively works, update later - sed -i '/^add_folder_recursively "${PKG_MANAGER_ROOT}".*/a add_folder_recursively "/Users/runner/.opam/coq_for_waterproof/lib/coq/user-contrib" "Waterproof" ' ../platform/macos/create_installer_macos.sh + sed -i '/^add_folder_recursively "${PKG_MANAGER_ROOT}".*/a add_folder_recursively "/Users/runner/.opam/coq_for_waterproof" "lib/coq/user-contrib/Waterproof" ' ../platform/macos/create_installer_macos.sh elif [[ $line =~ ^OPAM* ]] ; then opam install -y $package_name fi From c90fa03cd64bb71d9af0bdb0e6f51687d7501b2c Mon Sep 17 00:00:00 2001 From: davidot Date: Thu, 3 Nov 2022 17:21:55 +0100 Subject: [PATCH 27/30] Use newer mac version again --- .github/workflows/MacOs_8.15.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml index de36abc..f355a37 100644 --- a/.github/workflows/MacOs_8.15.yml +++ b/.github/workflows/MacOs_8.15.yml @@ -20,7 +20,7 @@ jobs: # This workflow contains a single job called "build" Ubuntu_platform: name: MacOS - runs-on: macos-10.15 + runs-on: macos-11 # Steps represent a sequence of tasks that will be executed as part of the job steps: From 3e5b90181c22698bda3a99afb15b157ae5911b6b Mon Sep 17 00:00:00 2001 From: davidot Date: Thu, 10 Nov 2022 14:42:58 +0100 Subject: [PATCH 28/30] Change name --- .github/workflows/MacOs_8.15.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml index f355a37..e7cf1b6 100644 --- a/.github/workflows/MacOs_8.15.yml +++ b/.github/workflows/MacOs_8.15.yml @@ -1,5 +1,5 @@ # This is a basic workflow to help you get started with Actions -name: MacOS-2 +name: MacOS 8.15 # Controls when the workflow will run on: From f25cac77116090956c63d0702152a680e45ae4b4 Mon Sep 17 00:00:00 2001 From: davidot Date: Thu, 10 Nov 2022 14:45:22 +0100 Subject: [PATCH 29/30] Remove old 8.14 workflows --- .github/workflows/MacOs_8.14.yml | 166 ------------------------- .github/workflows/MacOs_8.14_base.yml | 167 -------------------------- 2 files changed, 333 deletions(-) delete mode 100644 .github/workflows/MacOs_8.14.yml delete mode 100644 .github/workflows/MacOs_8.14_base.yml diff --git a/.github/workflows/MacOs_8.14.yml b/.github/workflows/MacOs_8.14.yml deleted file mode 100644 index 02caf66..0000000 --- a/.github/workflows/MacOs_8.14.yml +++ /dev/null @@ -1,166 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: MacOS-8.14 - -# Controls when the workflow will run -# on: -# # Triggers the workflow on push or pull request events but only for the main branch -# push: - -# # Allows you to run this workflow manually from the Actions tab -# workflow_dispatch: - -############################################################################### -# Platform script options shared among all jobs -############################################################################### -env: - COQREGTESTING: y - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - Ubuntu_platform: - name: MacOS - runs-on: macos-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - - name: Set git to use LF - run: | - git config --global core.autocrlf false - git config --global core.eol lf - - - name: Git checkout install scripts - uses: actions/checkout@v2 - with: - path: main - - - name: Git checkout Coq platform - uses: actions/checkout@v2 - with: - repository: coq/platform - path: platform - - - name: Cache opam/coq - id: cache-opam - uses: actions/cache@v3 - env: - cache-name: cache-opam-modules - with: - path: ~/.opam - key: ${{ runner.os }}-build-${{ env.cache-name }}-8.14 - - - name: Install homebrew and make - shell: bash - run: | - pwd - /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - brew update - brew install make - brew install gcc - brew install unzip - if [[ $(uname -m) == 'arm64' ]]; then - export PATH=/opt/homebrew/bin:$PATH - fi - - #Github actions uses bash 3 instead of bash 4 which is needed for the installer script :) - - name: Install Bash 4 and GNU sed on Mac - run: | - brew install bash - brew install gnu-sed - - echo "/usr/local/bin" >> $GITHUB_PATH - echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH - - - name: Install Opam - run: | - brew install opam - - - name: Set switch name in coq platform - shell: bash - run: | - echo COQ_PLATFORM_SWITCH_NAME=coq_for_waterproof >> platform/package_picks/coq_platform_switch_name.sh - cat platform/package_picks/coq_platform_switch_name.sh - - - if: ${{ steps.cache-opam.outputs.cache-hit != 'true' }} - name: Run coq platform make - shell: bash - run: | - cd platform - opam init - chmod +x coq_platform_make.sh - ./coq_platform_make.sh -extent=b -parallel=p -jobs=2 -vst=n -compcert=n -pick="8.14~2022.01" -set-switch=y - opam init - eval $(opam env) - - - if: ${{ steps.cache-opam.outputs.cache-hit != 'true' }} - name: Install serapi - shell: bash - run: | - opam install -y coq-serapi - opam install -y coq-coquelicot - - - name: Install system utilities - shell: bash - run: | - brew install findutils - brew install coreutils - pip3 install macpack - - # These libraries returned {dir} not found errors, installing them seems to solve the issue. - # Problem with installed libraries for workflows? - - name: Install libraries that gave errors in installer creation - shell: bash - run: | - brew install adwaita-icon-theme - brew install gtksourceview3 - - - name: Opam install coq-ide - shell: bash - run: | - brew install expat libxml2 - opam install -y coqide - - - name: Checking glib directory and compiling? - shell: bash - run: | - pwd - cd /usr/local/share/glib-2.0/schemas - glib-compile-schemas . - pwd - ls - - - name: Install packages from cfg and add to installer - shell: bash - run: | - cd main - eval $(opam env) - chmod +x install_packages_macos.sh - ./install_packages_macos.sh packages_macos.cfg - - - name: Create installer (original) - shell: bash - run: | - cd platform - pwd - eval $(opam env) - opm info - opam switch coq_for_waterproof - chmod +x macos/create_installer_macos.sh - ./macos/create_installer_macos.sh -q - - - name: Check install - shell: bash - run: | - cd platform/macos_installer - pwd - ls - - - name: 'Upload Artifact' - if: always() - uses: actions/upload-artifact@v2 - with: - name: 'MacOs installer Shell Script' - path: platform/macos_installer/*.dmg - retention-days: 5 - diff --git a/.github/workflows/MacOs_8.14_base.yml b/.github/workflows/MacOs_8.14_base.yml deleted file mode 100644 index f9c3e4f..0000000 --- a/.github/workflows/MacOs_8.14_base.yml +++ /dev/null @@ -1,167 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: MacOS - -# Controls when the workflow will run -# on: -# # Triggers the workflow on push or pull request events but only for the main branch -# push: -# branches: -# - macos - -# # Allows you to run this workflow manually from the Actions tab -# workflow_dispatch: - -############################################################################### -# Platform script options shared among all jobs -############################################################################### -env: - COQREGTESTING: y - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - Ubuntu_platform: - name: MacOS - runs-on: macos-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - - name: Set git to use LF - run: | - git config --global core.autocrlf false - git config --global core.eol lf - - - name: Git checkout install scripts - uses: actions/checkout@v2 - with: - path: main - - - name: Git checkout Coq platform - uses: actions/checkout@v2 - with: - repository: coq/platform - path: platform - - - name: Cache opam/coq - id: cache-opam - uses: actions/cache@v3 - env: - cache-name: cache-opam-modules - with: - path: ~/.opam - key: ${{ runner.os }}-build-${{ env.cache-name }}-8.14 - - - name: Install homebrew and make - shell: bash - run: | - pwd - /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - brew update - brew install make - brew install gcc - brew install unzip - if [[ $(uname -m) == 'arm64' ]]; then - export PATH=/opt/homebrew/bin:$PATH - fi - - #Github actions uses bash 3 instead of bash 4 which is needed for the installer script :) - - name: Install Bash 4 and GNU sed on Mac - run: | - brew install bash - brew install gnu-sed - - echo "/usr/local/bin" >> $GITHUB_PATH - echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH - - - name: Install Opam - run: | - brew install opam - - - name: Set switch name in coq platform - shell: bash - run: | - echo COQ_PLATFORM_SWITCH_NAME=coq_for_waterproof >> platform/package_picks/coq_platform_switch_name.sh - cat platform/package_picks/coq_platform_switch_name.sh - - - if: ${{ steps.cache-opam.outputs.cache-hit != 'true' }} - name: Run coq platform make - shell: bash - run: | - pwd - cd platform - chmod +x coq_platform_make.sh - ./coq_platform_make.sh -extent=b -parallel=p -jobs=2 -vst=n -compcert=n -pick="8.14~2022.01" -set-switch=y - - - if: ${{ steps.cache-opam.outputs.cache-hit != 'true' }} - name: Install serapi - shell: bash - run: | - opam install -y coq-serapi - opam install -y coq-coquelicot - -# - name: Install Waterproof library -# shell: bash -# run: | -# git clone https://github.com/impermeable/coq-waterproof -# cd coq-waterproof -# make -# make install -# cd .. -# rm -rf coq-waterproof - - - name: Install system utilities - shell: bash - run: | - brew install findutils - brew install coreutils - pip3 install macpack - - # These libraries returned {dir} not found errors, installing them seems to solve the issue. - # Problem with installed libraries for workflows? - - name: Install libraries that gave errors in installer creation - shell: bash - run: | - brew install adwaita-icon-theme - brew install gtksourceview3 - - - name: Opam install coq-ide - shell: bash - run: | - brew install expat libxml2 - opam install -y coqide - - - name: Checking glib directory and compiling? - shell: bash - run: | - pwd - cd /usr/local/share/glib-2.0/schemas - glib-compile-schemas . - pwd - ls - - - name: Create installer (original) - shell: bash - run: | - cd platform - pwd - ls - opam switch coq_for_waterproof - chmod +x macos/create_installer_macos.sh - ./macos/create_installer_macos.sh -q - - - name: Check install - shell: bash - run: | - cd platform/macos_installer - pwd - ls - - - name: 'Upload Artifact' - if: always() - uses: actions/upload-artifact@v2 - with: - name: 'MacOs installer Shell Script' - path: platform/macos_installer/*.dmg - retention-days: 5 - From 2a61619fa0774b54599351b8df326b0d93d58da8 Mon Sep 17 00:00:00 2001 From: M-J-V Date: Thu, 10 Nov 2022 15:42:49 +0100 Subject: [PATCH 30/30] Run test --- .github/workflows/MacOs_8.15.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/MacOs_8.15.yml b/.github/workflows/MacOs_8.15.yml index e7cf1b6..05d120e 100644 --- a/.github/workflows/MacOs_8.15.yml +++ b/.github/workflows/MacOs_8.15.yml @@ -62,7 +62,7 @@ jobs: export PATH=/opt/homebrew/bin:$PATH fi - #Github actions uses bash 3 instead of bash 4 which is needed for the installer script :) + # Github actions uses bash 3 instead of bash 4 which is needed for the installer script :) - name: Install Bash 4 and GNU sed on Mac run: | brew install bash