From fbe8a4d7ee71034e46ae2e24260701ad86a8ccc2 Mon Sep 17 00:00:00 2001 From: Anton Prosekin Date: Tue, 8 Nov 2022 12:37:41 +0800 Subject: [PATCH 01/11] Check for github checkout --- .github/workflows/dlfcn_install.yml | 39 +++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/dlfcn_install.yml diff --git a/.github/workflows/dlfcn_install.yml b/.github/workflows/dlfcn_install.yml new file mode 100644 index 0000000..8f48153 --- /dev/null +++ b/.github/workflows/dlfcn_install.yml @@ -0,0 +1,39 @@ +name: dlfcn-install + +on: + workflow_dispatch: + +jobs: + test: + runs-on: ${{ matrix.os }} + + strategy: + matrix: + include: + - os: windows-latest + python-version: "3.10" + fail-fast: false + steps: + - uses: actions/checkout@master + with: + name: dlfcn-win32/dlfcn-win32 + ref: refs/heads/release + + - run: ls -halt + # - uses: actions/checkout@v3 + # with: + # submodules: true + + # - uses: actions/setup-python@v2 + # with: + # python-version: ${{ matrix.python-version }} + # - uses: awvwgk/setup-fortran@main + # id: setup-fortran + # with: + # compiler: gcc + # version: 11 + # - run: python -m pip install --upgrade pip + # - run: python -m pip install cmake + # - run: curl -L + + From 8ed62182008c770f26c08a2e14d6e187a7907014 Mon Sep 17 00:00:00 2001 From: Anton Prosekin Date: Tue, 8 Nov 2022 14:20:56 +0800 Subject: [PATCH 02/11] Check curl --- .github/workflows/dlfcn_install.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dlfcn_install.yml b/.github/workflows/dlfcn_install.yml index 8f48153..8be9a31 100644 --- a/.github/workflows/dlfcn_install.yml +++ b/.github/workflows/dlfcn_install.yml @@ -14,11 +14,12 @@ jobs: python-version: "3.10" fail-fast: false steps: - - uses: actions/checkout@master - with: - name: dlfcn-win32/dlfcn-win32 - ref: refs/heads/release + # - uses: actions/checkout@master + # with: + # name: dlfcn-win32/dlfcn-win32 + # ref: refs/heads/release + - run: curl -LJO https://github.com/dlfcn-win32/dlfcn-win32/archive/refs/heads/master.zip - run: ls -halt # - uses: actions/checkout@v3 # with: From 81c3e10c356f362978a54697800d079b0a7a5316 Mon Sep 17 00:00:00 2001 From: Anton Prosekin Date: Tue, 8 Nov 2022 14:39:49 +0800 Subject: [PATCH 03/11] Unpacking and installing dlfcn --- .github/workflows/dlfcn_install.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dlfcn_install.yml b/.github/workflows/dlfcn_install.yml index 8be9a31..fe565f8 100644 --- a/.github/workflows/dlfcn_install.yml +++ b/.github/workflows/dlfcn_install.yml @@ -20,7 +20,24 @@ jobs: # ref: refs/heads/release - run: curl -LJO https://github.com/dlfcn-win32/dlfcn-win32/archive/refs/heads/master.zip - - run: ls -halt + - run: unzip dlfcn-win32-master.zip + + - uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + + - uses: awvwgk/setup-fortran@main + id: setup-fortran + with: + compiler: gcc + version: 11 + + + - run: python -m pip install --upgrade pip + - run: python -m pip install cmake + - run: cmake -S ./dlfcn-win32-master -B ./build_dlfcn + - run: cmake --build ./build_dlfcn + - run: cmake --install ./build_dlfcn # - uses: actions/checkout@v3 # with: # submodules: true From f2608eb4388808ef5110b2618d8807fcb640f1d1 Mon Sep 17 00:00:00 2001 From: Anton Prosekin Date: Tue, 8 Nov 2022 16:42:27 +0800 Subject: [PATCH 04/11] Change generator --- .github/workflows/dlfcn_install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dlfcn_install.yml b/.github/workflows/dlfcn_install.yml index fe565f8..c849ff0 100644 --- a/.github/workflows/dlfcn_install.yml +++ b/.github/workflows/dlfcn_install.yml @@ -35,7 +35,7 @@ jobs: - run: python -m pip install --upgrade pip - run: python -m pip install cmake - - run: cmake -S ./dlfcn-win32-master -B ./build_dlfcn + - run: cmake -S ./dlfcn-win32-master -B ./build_dlfcn -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release - run: cmake --build ./build_dlfcn - run: cmake --install ./build_dlfcn # - uses: actions/checkout@v3 From b092ba06cc27e7be959e94e0b5c48392d0afac62 Mon Sep 17 00:00:00 2001 From: Anton Prosekin Date: Tue, 8 Nov 2022 17:11:42 +0800 Subject: [PATCH 05/11] Check for single script --- .github/workflows/dlfcn_install.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/dlfcn_install.yml b/.github/workflows/dlfcn_install.yml index c849ff0..513ba54 100644 --- a/.github/workflows/dlfcn_install.yml +++ b/.github/workflows/dlfcn_install.yml @@ -18,9 +18,6 @@ jobs: # with: # name: dlfcn-win32/dlfcn-win32 # ref: refs/heads/release - - - run: curl -LJO https://github.com/dlfcn-win32/dlfcn-win32/archive/refs/heads/master.zip - - run: unzip dlfcn-win32-master.zip - uses: actions/setup-python@v2 with: @@ -32,12 +29,15 @@ jobs: compiler: gcc version: 11 + - run: | + curl -LJO https://github.com/dlfcn-win32/dlfcn-win32/archive/refs/heads/master.zip + unzip dlfcn-win32-master.zip + python -m pip install --upgrade pip + python -m pip install cmake + cmake -S ./dlfcn-win32-master -B ./build_dlfcn -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release + cmake --build ./build_dlfcn + cmake --install ./build_dlfcn - - run: python -m pip install --upgrade pip - - run: python -m pip install cmake - - run: cmake -S ./dlfcn-win32-master -B ./build_dlfcn -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release - - run: cmake --build ./build_dlfcn - - run: cmake --install ./build_dlfcn # - uses: actions/checkout@v3 # with: # submodules: true From 011488aa653a70e98e2cceaf32048ec85785aa58 Mon Sep 17 00:00:00 2001 From: Anton Prosekin Date: Tue, 8 Nov 2022 18:09:04 +0800 Subject: [PATCH 06/11] Check for install prefix --- .github/workflows/dlfcn_install.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dlfcn_install.yml b/.github/workflows/dlfcn_install.yml index 513ba54..c84e617 100644 --- a/.github/workflows/dlfcn_install.yml +++ b/.github/workflows/dlfcn_install.yml @@ -34,9 +34,10 @@ jobs: unzip dlfcn-win32-master.zip python -m pip install --upgrade pip python -m pip install cmake - cmake -S ./dlfcn-win32-master -B ./build_dlfcn -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release + cmake -S ./dlfcn-win32-master -B ./build_dlfcn -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX="/c/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64" cmake --build ./build_dlfcn - cmake --install ./build_dlfcn + cmake --install ./build_dlfcn # - uses: actions/checkout@v3 # with: From aeca52e0fc32149c44e08f95cc15d1f1234df41d Mon Sep 17 00:00:00 2001 From: Anton Prosekin Date: Tue, 8 Nov 2022 18:19:40 +0800 Subject: [PATCH 07/11] Changes with long lines --- .github/workflows/dlfcn_install.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dlfcn_install.yml b/.github/workflows/dlfcn_install.yml index c84e617..5b2916d 100644 --- a/.github/workflows/dlfcn_install.yml +++ b/.github/workflows/dlfcn_install.yml @@ -34,8 +34,10 @@ jobs: unzip dlfcn-win32-master.zip python -m pip install --upgrade pip python -m pip install cmake - cmake -S ./dlfcn-win32-master -B ./build_dlfcn -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release \ + - run: > + cmake -S ./dlfcn-win32-master -B ./build_dlfcn -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/c/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64" + - run: | cmake --build ./build_dlfcn cmake --install ./build_dlfcn From 934976c0167bc38191939466c32c930249b94a21 Mon Sep 17 00:00:00 2001 From: Anton Prosekin Date: Tue, 8 Nov 2022 19:01:19 +0800 Subject: [PATCH 08/11] Check default dirs --- .github/workflows/dlfcn_install.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/dlfcn_install.yml b/.github/workflows/dlfcn_install.yml index 5b2916d..1692582 100644 --- a/.github/workflows/dlfcn_install.yml +++ b/.github/workflows/dlfcn_install.yml @@ -29,6 +29,8 @@ jobs: compiler: gcc version: 11 + - run: echo | cpp -v + - run: | curl -LJO https://github.com/dlfcn-win32/dlfcn-win32/archive/refs/heads/master.zip unzip dlfcn-win32-master.zip From 2ab301a5414501abb6c98f477b62c50edb186f73 Mon Sep 17 00:00:00 2001 From: Anton Prosekin Date: Tue, 8 Nov 2022 19:10:51 +0800 Subject: [PATCH 09/11] Fix echo --- .github/workflows/dlfcn_install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dlfcn_install.yml b/.github/workflows/dlfcn_install.yml index 1692582..63ade69 100644 --- a/.github/workflows/dlfcn_install.yml +++ b/.github/workflows/dlfcn_install.yml @@ -29,7 +29,7 @@ jobs: compiler: gcc version: 11 - - run: echo | cpp -v + - run: echo "" | cpp -v - run: | curl -LJO https://github.com/dlfcn-win32/dlfcn-win32/archive/refs/heads/master.zip From 5026a563751220ef2de0c5cc5341677e0186d0a5 Mon Sep 17 00:00:00 2001 From: Anton Prosekin Date: Tue, 8 Nov 2022 20:42:26 +0800 Subject: [PATCH 10/11] Check include paths --- .github/workflows/dlfcn_install.yml | 2 +- hello.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 hello.c diff --git a/.github/workflows/dlfcn_install.yml b/.github/workflows/dlfcn_install.yml index 63ade69..3caa326 100644 --- a/.github/workflows/dlfcn_install.yml +++ b/.github/workflows/dlfcn_install.yml @@ -29,7 +29,7 @@ jobs: compiler: gcc version: 11 - - run: echo "" | cpp -v + - run: gcc -v -o hello.exe hello.cz - run: | curl -LJO https://github.com/dlfcn-win32/dlfcn-win32/archive/refs/heads/master.zip diff --git a/hello.c b/hello.c new file mode 100644 index 0000000..68e1f33 --- /dev/null +++ b/hello.c @@ -0,0 +1,7 @@ +// hello.c +#include + +int main() { + printf("Hello, world!\n"); + return 0; +} \ No newline at end of file From e856253c01adc1afeffa4bc8246bacf7e5735e03 Mon Sep 17 00:00:00 2001 From: Anton Prosekin Date: Tue, 8 Nov 2022 20:50:31 +0800 Subject: [PATCH 11/11] Change extension --- .github/workflows/dlfcn_install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dlfcn_install.yml b/.github/workflows/dlfcn_install.yml index 3caa326..5a7c038 100644 --- a/.github/workflows/dlfcn_install.yml +++ b/.github/workflows/dlfcn_install.yml @@ -29,7 +29,7 @@ jobs: compiler: gcc version: 11 - - run: gcc -v -o hello.exe hello.cz + - run: gcc -v -o hello.exe hello.c - run: | curl -LJO https://github.com/dlfcn-win32/dlfcn-win32/archive/refs/heads/master.zip