Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 1.1-dev into 1.2-dev #1311

Closed
wants to merge 2 commits into from
Closed

Merge 1.1-dev into 1.2-dev #1311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ec98b5
Merge 1.1-dev into 1.2-dev
jpmckinney Jun 16, 2021
a407dda
Merge branch '1.2-dev' into merge-1.1
jpmckinney Jun 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,29 @@ jobs:
- 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
- name: Make
run: |
if [ $GITHUB_REPOSITORY = 'open-contracting/standard_profile_template' ]; then
python schema/build-profile.py
make extract
fi
- if: github.repository == 'open-contracting/standard_profile_template'
run: make update extract
- run: |
make
python util/add_translation_notes.py
- run: |
make linkcheck
rm -f output.json output.txt
- run: pytest
- uses: shimataro/ssh-key-action@v2
# 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
- uses: little-core-labs/netrc-creds@v2.1.0
- if: github.event_name == 'push'
uses: little-core-labs/netrc-creds@v2.1.0
with:
machine: standard.open-contracting.org
login: manage
password: ${{ secrets.ELASTICSEARCH_PASSWORD }}
- if: success()
- if: github.event_name == 'push' && success() && github.repository != 'open-contracting/standard_profile_template'
env:
PATH_PREFIX: ''
run: |
if [ $GITHUB_REPOSITORY != 'open-contracting/standard_profile_template' ]; then
curl -sS https://raw.githubusercontent.com/open-contracting/deploy/main/deploy-docs.sh | bash -
fi
PATH_PREFIX: ""
PRODUCTION: ${{ github.ref == 'refs/heads/latest' || github.ref == 'refs/heads/1.0' || github.ref == 'refs/heads/1.1' }}
run: curl -sS https://raw.githubusercontent.com/open-contracting/deploy/main/deploy-docs.sh | bash -
4 changes: 3 additions & 1 deletion .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,7 @@ jobs:
${{ runner.os }}-pip-
- run: curl -s -S --retry 3 $BASEDIR/tests/install.sh | bash -
- run: sudo apt-get install shellcheck
- run: sudo snap install shfmt
- run: curl -s -S --retry 3 $BASEDIR/tests/script.sh | bash -
- run: shellcheck script/*
- run: shellcheck $(shfmt -f .)
- run: shfmt -d -i 4 -sr $(shfmt -f .)
Loading