Skip to content

Commit 974256e

Browse files
author
Nat!
committed
try to fix win build (and OBC)
1 parent 106e853 commit 974256e

File tree

1 file changed

+25
-11
lines changed

1 file changed

+25
-11
lines changed

.github/workflows/cmake-errors.yml

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
compiler: gcc
2121
cflags: -Werror -Wall -Wextra
2222
build-dir: ../build
23-
src-dir: ../mulle-core
23+
src-dir: ../mulle-objc-runtime
2424

2525
- name: Ubuntu GCC -O3
2626
os: ubuntu-latest
@@ -75,19 +75,33 @@ jobs:
7575
id: set-install-dir
7676
shell: bash
7777
run: |
78-
if [ "$RUNNER_OS" == "Windows" ]; then
79-
echo "INSTALL_DIR=$GITHUB_WORKSPACE/mulle-install" >> $GITHUB_OUTPUT
78+
if [ "$RUNNER_OS" == "Windows" ]
79+
then
80+
SRC_DIR="$GITHUB_WORKSPACE\\tmp"
81+
INSTALL_DIR="$GITHUB_WORKSPACE\\usr"
82+
MULLE_CORE_SRC_DIR="$SRC_DIR\\mulle-core"
83+
MULLE_ATINIT_SRC_DIR="$SRC_DIR\\mulle-atinit"
84+
MULLE_ATEXIT_SRC_DIR="$SRC_DIR\\mulle-atexit"
8085
else
81-
echo "INSTALL_DIR=$GITHUB_WORKSPACE/mulle-install" >> $GITHUB_OUTPUT
86+
SRC_DIR="$GITHUB_WORKSPACE/tmp"
87+
INSTALL_DIR="$GITHUB_WORKSPACE/usr"
88+
MULLE_CORE_SRC_DIR="$SRC_DIR/mulle-core"
89+
MULLE_ATINIT_SRC_DIR="$SRC_DIR/mulle-atinit"
90+
MULLE_ATEXIT_SRC_DIR="$SRC_DIR/mulle-atexit"
8291
fi
83-
mkdir -p $GITHUB_WORKSPACE/mulle-install
92+
echo "INSTALL_DIR=$INSTALL_DIR" >> $GITHUB_OUTPUT
93+
echo "MULLE_CORE_SRC_DIR=$MULLE_CORE_SRC_DIR" >> $GITHUB_OUTPUT
94+
echo "MULLE_ATINIT_SRC_DIR=$MULLE_ATINIT_SRC_DIR" >> $GITHUB_OUTPUT
95+
echo "MULLE_ATEXIT_SRC_DIR=$MULLE_ATEXIT_SRC_DIR" >> $GITHUB_OUTPUT
96+
mkdir -p "$SRC_DIR"
97+
mkdir -p "$INSTALL_DIR"
8498
8599
- name: Clone mulle-core repository
86100
run: |
87-
git clone https://github.com/mulle-core/mulle-core.git /tmp/mulle-core
101+
git clone https://github.com/mulle-core/mulle-core.git "${MULLE_CORE_SRC_DIR}"
88102
89103
- name: Configure, build and install mulle-core with CMake
90-
working-directory: /tmp/mulle-core
104+
working-directory: "${steps.set-install-dir.outputs.MULLE_CORE_SRC_DIR}"
91105
run: |
92106
export MULLE_SDK_PATH=${{ steps.set-install-dir.outputs.INSTALL_DIR }}
93107
cmake -B build \
@@ -100,10 +114,10 @@ jobs:
100114

101115
- name: Clone mulle-atinit repository
102116
run: |
103-
git clone https://github.com/mulle-core/mulle-atinit.git /tmp/mulle-atinit
117+
git clone https://github.com/mulle-core/mulle-atinit.git "${steps.set-install-dir.outputs.MULLE_ATINIT_SRC_DIR}"
104118
105119
- name: Configure, build and install mulle-atinit with CMake
106-
working-directory: /tmp/mulle-atinit
120+
working-directory: "${steps.set-install-dir.outputs.MULLE_ATINIT_SRC_DIR}"
107121
run: |
108122
export MULLE_SDK_PATH=${{ steps.set-install-dir.outputs.INSTALL_DIR }}
109123
cmake -B build \
@@ -116,10 +130,10 @@ jobs:
116130

117131
- name: Clone mulle-atexit repository
118132
run: |
119-
git clone https://github.com/mulle-core/mulle-atexit.git /tmp/mulle-atexit
133+
git clone https://github.com/mulle-core/mulle-atexit.git "${steps.set-install-dir.outputs.MULLE_ATEXIT_SRC_DIR}"
120134
121135
- name: Configure, build and install mulle-atexit with CMake
122-
working-directory: /tmp/mulle-atexit
136+
working-directory: "${steps.set-install-dir.outputs.MULLE_ATEXIT_SRC_DIR}"
123137
run: |
124138
export MULLE_SDK_PATH=${{ steps.set-install-dir.outputs.INSTALL_DIR }}
125139
cmake -B build \

0 commit comments

Comments
 (0)