Skip to content

Commit 791551e

Browse files
committed
Tmp: Select newest version of Xcode and additional mirror
- Add https://joliv.et to overcome ljll network problems
1 parent eb69e81 commit 791551e

File tree

2 files changed

+22
-7
lines changed

2 files changed

+22
-7
lines changed

.github/workflows/full-mpich.yml

+14-6
Original file line numberDiff line numberDiff line change
@@ -82,24 +82,32 @@ jobs:
8282
steps:
8383
- uses: actions/checkout@v4
8484

85+
# Remove homebrew LLVM compiler, and use most recent Xcode development
86+
# tools
8587
- name: Set environment
8688
run: |
87-
if [ "${{ matrix.version }}" -lt "15" ]; then
88-
echo "CXX=g++ -Wl,-ld_classic -Wl,-commons,use_dylibs -Wno-unused-command-line-argument" >> $GITHUB_ENV
89-
echo "LLVM_VERSION=15" >> $GITHUB_ENV
90-
elif [ "${{ matrix.version }}" -eq "15" ]; then
89+
if [ "${{ matrix.version }}" -eq "15" ]; then
9190
echo "LLVM_VERSION=18" >> $GITHUB_ENV
91+
sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
92+
elif [ "${{ matrix.version }}" -eq "14" ]; then
93+
echo "LLVM_VERSION=15" >> $GITHUB_ENV
94+
sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
95+
elif [ "${{ matrix.version }}" -eq "13" ]; then
96+
echo "LLVM_VERSION=15" >> $GITHUB_ENV
97+
sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
98+
echo "CXX=g++ -Wl,-ld_classic -Wl,-commons,use_dylibs -Wno-unused-command-line-argument" >> $GITHUB_ENV
9299
fi
93100
101+
# Check https://github.com/actions/runner-images/tree/main/images/macos
102+
# to see what is already installed in images.
94103
- name: Install
95104
run: |
96-
brew install gcc m4 git bison hdf5 cmake wget autoconf automake
105+
brew install m4 git bison hdf5 wget autoconf automake
97106
brew remove llvm@$LLVM_VERSION
98107
99108
- name: Symlink GCC & Fortran
100109
run: ./etc/actions/macos/link_fortran.sh "$(uname -p)"
101110

102-
103111
- name: Configure
104112
run: |
105113
autoreconf -i

3rdparty/getall

+8-1
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,14 @@ sub downloadone{
268268
print "Try (2 times) other site: $url\n";
269269
system $cmd;
270270
if ($?){
271-
$errors.="ERROR: $cmd FAILED\n"
271+
print "Download 3 times failed from $url of $pkg\n";
272+
my $url="https://joliv.et/freefem/pkg/$pkg";
273+
my $cmd="../bin/build/download $url pkg/$pkg $opts";
274+
print "Try (2 times) other site: $url\n";
275+
system $cmd;
276+
if ($?){
277+
$errors.="ERROR: $cmd FAILED\n"
278+
}
272279
}
273280
}
274281

0 commit comments

Comments
 (0)