Skip to content

Commit 34a3877

Browse files
authored
Merge pull request #3914 from jsiirola/osx-install
Update osx installers and urlchecker environment
2 parents 43a6446 + ed5afee commit 34a3877

3 files changed

Lines changed: 33 additions & 6 deletions

File tree

.github/workflows/test_branches.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,17 @@ jobs:
5050
black . --check --diff
5151
- name: Spell Check
5252
uses: crate-ci/typos@master
53-
with:
53+
with:
5454
config: ./.github/workflows/typos.toml
55+
- name: Set DNS server
56+
run: |
57+
# This will hopefully resolve intermittent DNS resolution errors
58+
echo "Reset DNS servers to use cloudfare"
59+
LINK=`resolvectl query github.com | grep link: | sed -r 's/.*link://'`
60+
sudo resolvectl dns $LINK 1.1.1.1 1.0.0.1
61+
sudo resolvectl flush-caches
62+
sudo resolvectl query github.com
63+
sudo resolvectl status
5564
- name: URL Checker
5665
if: env.PYOMO_WORKFLOW == 'branch'
5766
uses: urlstechie/urlchecker-action@0.0.34
@@ -214,7 +223,7 @@ jobs:
214223
# - install glpk
215224
# - pyodbc needs: gcc pkg-config unixodbc freetds
216225
for pkg in bash pkg-config unixodbc freetds glpk ginac; do
217-
brew list $pkg || brew install $pkg
226+
brew list $pkg 2>/dev/null || brew install $pkg
218227
done
219228
220229
- name: Update Linux
@@ -700,7 +709,7 @@ jobs:
700709
echo ""
701710
echo "PYOMO_CONFIG_DIR=${GITHUB_WORKSPACE}/config" >> $GITHUB_ENV
702711
703-
# this has to be done after Pyomo is installed because highspy
712+
# this has to be done after Pyomo is installed because highspy
704713
# depends on pyomo's find_library function
705714
- name: Install HiGHS
706715
if: ${{ ! matrix.slim }}

.github/workflows/test_pr_and_main.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,17 @@ jobs:
6161
black . --check --diff
6262
- name: Spell Check
6363
uses: crate-ci/typos@master
64-
with:
64+
with:
6565
config: ./.github/workflows/typos.toml
66+
- name: Set DNS server
67+
run: |
68+
# This will hopefully resolve intermittent DNS resolution errors
69+
echo "Reset DNS servers to use cloudfare"
70+
LINK=`resolvectl query github.com | grep link: | sed -r 's/.*link://'`
71+
sudo resolvectl dns $LINK 1.1.1.1 1.0.0.1
72+
sudo resolvectl flush-caches
73+
sudo resolvectl query github.com
74+
sudo resolvectl status
6675
- name: URL Checker
6776
if: env.PYOMO_WORKFLOW == 'branch'
6877
uses: urlstechie/urlchecker-action@0.0.34
@@ -266,7 +275,7 @@ jobs:
266275
# - install glpk
267276
# - pyodbc needs: gcc pkg-config unixodbc freetds
268277
for pkg in bash pkg-config unixodbc freetds glpk ginac; do
269-
brew list $pkg || brew install $pkg
278+
brew list $pkg 2>/dev/null || brew install $pkg
270279
done
271280
272281
- name: Update Linux
@@ -752,7 +761,7 @@ jobs:
752761
echo ""
753762
echo "PYOMO_CONFIG_DIR=${GITHUB_WORKSPACE}/config" >> $GITHUB_ENV
754763
755-
# this has to be done after Pyomo is installed because highspy
764+
# this has to be done after Pyomo is installed because highspy
756765
# depends on pyomo's find_library function
757766
- name: Install HiGHS
758767
if: ${{ ! matrix.slim }}

.github/workflows/url_check.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@ jobs:
1515
steps:
1616
- name: Checkout Pyomo source
1717
uses: actions/checkout@v6
18+
- name: Set DNS server
19+
run: |
20+
# This will hopefully resolve intermittent DNS resolution errors
21+
echo "Reset DNS servers to use cloudfare"
22+
LINK=`resolvectl query github.com | grep link: | sed -r 's/.*link://'`
23+
sudo resolvectl dns $LINK 1.1.1.1 1.0.0.1
24+
sudo resolvectl flush-caches
25+
sudo resolvectl query github.com
26+
sudo resolvectl status
1827
- name: URL Checker
1928
uses: urlstechie/urlchecker-action@0.0.34
2029
with:

0 commit comments

Comments
 (0)