Skip to content

Commit

Permalink
Merge branch '1.2-dev' into 817-value-amount
Browse files Browse the repository at this point in the history
  • Loading branch information
odscjen authored Sep 11, 2023
2 parents a560367 + 62220a6 commit c81fbde
Show file tree
Hide file tree
Showing 151 changed files with 7,181 additions and 4,616 deletions.
15 changes: 7 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,31 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: '3.10'
cache: pip
cache-dependency-path: '**/requirements*.txt'
# Don't install editable projects in the current working directory.
# https://pip.pypa.io/en/latest/reference/pip_install/#install-src
- run: pip install --src $GITHUB_WORKSPACE/../src -r requirements.txt
# Google Chrome and ChromeDriver are already included.
# https://help.github.com/en/actions/reference/software-installed-on-github-hosted-runners
# https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md
- if: github.repository == 'open-contracting/standard_profile_template'
run: make update extract
- run: make
# Disable linkcheck as it is too slow for development.
# - run: |
# make linkcheck
# rm -f output.json output.txt
- run: pytest -W error
# "ResourceWarning: unclosed file <_io.BufferedWriter name='/dev/null'>"
- run: pytest -W error -W ignore::ResourceWarning
# Deploy the built documentation to the staging directory.
- if: github.event_name == 'push'
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.PRIVATE_KEY }}
known_hosts: standard.open-contracting.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWLziEiV46d9iInFXAR/PxPvotcpmMtbwO8GkTF2/AFUkyiSd8/Yg5HXUoWBz7hbRwg2O+q5F1QfD57vevBV7c+JKyBbKVOi/mXaf7uACxer419RTgKcpaMhNRi708XWhNlWiKp3Afs/MDMvMdWSrU+Ht7biNb1OMGjfNMDdlsJxPycxMQ7Fu7i+kdyMkKLYDIHNeEw0aW9PtMTReUE0y/Ghn44PDR2u9/oZsEhC0ELDQUfsjtCcoM91FH1tjRBZkOW/j5940nMoJpbVhFHTC3YY9Mh2kV+N6Whht5nghJ7Jl2vN5W0Uer+TNMVRV4QMu8xK5HXbjKFMpaK+j4gBs9
known_hosts: standard.open-contracting.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGveFGTJ9yyObNGDUCUyzyFkm6Kzh3YqIt1qB7B/KU6E
- if: github.event_name == 'push'
uses: little-core-labs/netrc-creds@v2.1.0
uses: bcomnes/netrc-creds@v2
with:
machine: standard.open-contracting.org
login: manage
Expand All @@ -45,4 +43,5 @@ jobs:
PRODUCTION: ${{ startsWith(github.ref, 'refs/tags') || github.ref == 'refs/heads/latest' || github.ref == 'refs/heads/1.0' || github.ref == 'refs/heads/1.1' }}
RELEASE: ${{ startsWith(github.ref, 'refs/tags') }}
VERSION: "1.1"
shell: bash
run: curl -sS https://raw.githubusercontent.com/open-contracting/deploy/main/deploy-docs.sh | bash -
4 changes: 2 additions & 2 deletions .github/workflows/js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16.x
- run: npm install standard
node-version: 18
- run: npm install standard [email protected]
- run: npx standard docs/_static/script.js
10 changes: 6 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: '3.10'
cache: pip
cache-dependency-path: '**/requirements*.txt'
- run: curl -s -S --retry 3 $BASEDIR/tests/install.sh | bash -
- run: curl -s -S --retry 3 $BASEDIR/tests/script.sh | bash -
- shell: bash
run: curl -s -S --retry 3 $BASEDIR/tests/install.sh | bash -
- shell: bash
run: curl -s -S --retry 3 $BASEDIR/tests/script.sh | bash -
13 changes: 13 additions & 0 deletions .github/workflows/spellcheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Spell-check
on: [push, pull_request]
jobs:
build:
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.10'
- run: pip install codespell
- run: codespell -S .git,docson,locale,examples,country.csv,currency.csv,language.csv,mediaType.csv -L fo,zar .
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
/*.pdf
/build
/cache.sqlite
/chromedriver
/chromedriver_linux64.zip
/chromedriver_mac64.zip
/chromedriver_win32.zip
/docs/_static/patched
/src
*.pyc
Loading

0 comments on commit c81fbde

Please sign in to comment.