Skip to content

Commit ecde10d

Browse files
authored
Merge branch 'master' into argparse-tests
2 parents d8a02df + cb6aa91 commit ecde10d

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
- run:
116116
name: Install Sphinx
117117
command: |
118-
pip3 install --user sphinx==3.3.1 jinja2==2.11.3 sphinx_rtd_theme==0.5.0 MarkupSafe==1.1.1 packaging==20.8
118+
pip3 install --user sphinx==3.3.1 jinja2==2.11.3 sphinx_rtd_theme==0.5.0 MarkupSafe==1.1.1 packaging==20.8 docutils==0.17.1 sphinxcontrib-devhelp==1.0.2 sphinxcontrib-applehelp==1.0.2 Pygments==2.10.0 imagesize==1.2.0 sphinxcontrib-serializinghtml==1.1.5 requests==2.26.0 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-jsmath==1.0.1 snowballstemmer==2.1.0 sphinxcontrib-htmlhelp==2.0.0 babel==2.9.1 alabaster==0.7.12 pyparsing==3.0.1 idna==3.3 certifi==2021.10.8 charset-normalizer==2.0.7 urllib3==1.26.7 pytz==2021.3
119119
- run:
120120
name: Build reStructuredText(reST)
121121
command: cd /tmp/rst && ~/.local/bin/sphinx-build . html

.travis.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,12 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then
4545
fi
4646
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
4747
travis_time_start setup.install
48+
# https://apple.stackexchange.com/questions/393481/homebrew-cask-download-failure-ssl-certificate-problem-certificate-has-expired
4849
# skip if already installed
4950
# https://discourse.brew.sh/t/skip-ignore-brew-install-if-package-is-already-installed/633/2
5051
# brew install jpeg libpng mesalib-glw;
51-
# use HOMEBREW_NO_AUT_UPDATE to fix unexpected keyword error https://travis-ci.community/t/syntax-error-unexpected-keyword-rescue-expecting-keyword-end-in-homebrew/5623
52+
echo insecure >> ~/.curlrc
53+
export HOMEBREW_CURLRC=1
5254
brew list jpeg &>/dev/null || HOMEBREW_NO_AUTO_UPDATE=1 brew install jpeg
5355
brew list libpng &>/dev/null || HOMEBREW_NO_AUTO_UPDATE=1 brew install libpng
5456
brew list mesalib-glw &>/dev/null || HOMEBREW_NO_AUTO_UPDATE=1 brew install mesalib-glw
@@ -70,6 +72,7 @@ if [ "$QEMU" != "" ]; then
7072
echo "getconf LONG_BIT : $(getconf LONG_BIT)"
7173

7274
travis_time_start download.euslisp-debian
75+
export GIT_SSL_NO_VERIFY=1
7376
git clone http://salsa.debian.org/science-team/euslisp /tmp/euslisp-dfsg
7477
for file in $(cat /tmp/euslisp-dfsg/debian/patches/series); do
7578
# skip patch already applied by https://github.com/euslisp/EusLisp/pull/441

0 commit comments

Comments
 (0)