Skip to content

Commit ef470ed

Browse files
committed
Fix CI problems
1 parent bb7ca22 commit ef470ed

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/test-linux-mac.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
body: ${{ github.event.pull_request.body }}
5050
run: |
5151
package="$(echo "$body" | sed -n '1p')"
52-
if [ -z "${package}" ]; then
52+
if [[ ! "${package}" =~ ^https:// ]]; then
5353
package="https://github.com/JuliaInterop/CxxWrap.jl.git"
5454
fi
5555
if [[ "$OSTYPE" != "darwin"* ]]; then
@@ -58,8 +58,8 @@ jobs:
5858
mkdir build && cd build
5959
CXXFLAGS=-ftemplate-backtrace-limit=0 cmake -DCMAKE_INSTALL_PREFIX=$HOME/install -DAPPEND_OVERRIDES_TOML=ON -DCMAKE_BUILD_TYPE=Debug ..
6060
VERBOSE=ON cmake --build . --config Debug --target install
61-
wget https://github.com/JuliaBinaryWrappers/libcxxwrap_julia_jll.jl/raw/main/Project.toml
62-
jllversion=$(grep "version" Project.toml | sed -r 's/.* = "(.*)\+.*/\1/')
61+
wget https://github.com/JuliaRegistries/General/raw/refs/heads/master/jll/L/libcxxwrap_julia_jll/Versions.toml
62+
jllversion=$(grep '\["' Versions.toml | tail -n 1 | sed -E 's/\["([0-9]+\.[0-9]+\.[0-9]+)\+[^"]*"\]/\1/g')
6363
cd lib
6464
if [ ! -f libcxxwrap_julia.${jllversion}.dylib ]; then
6565
ln -s libcxxwrap_julia.*.*.*.* libcxxwrap_julia.${jllversion}.dylib

.github/workflows/test-win.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
cd build
4141
cmake -G "Visual Studio 17 2022" -A x64 -DOVERRIDES_PATH=$HOMEDRIVE/$HOMEPATH/.julia/artifacts/Overrides.toml -DOVERRIDE_ROOT=./ -DAPPEND_OVERRIDES_TOML=ON ..
4242
package="$(echo "$body" | sed -n '1p')"
43-
if [ -z "${package}" ]; then
43+
if [[ ! "${package}" =~ ^https:// ]]; then
4444
package="https://github.com/JuliaInterop/CxxWrap.jl.git"
4545
fi
4646
cmake --build . --config Debug

0 commit comments

Comments
 (0)