Skip to content

Commit

Permalink
Merge branch 'dev' into ci-set-output
Browse files Browse the repository at this point in the history
  • Loading branch information
Situphen authored Mar 20, 2023
2 parents 63e503d + 9df6b80 commit ab81e90
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 21 deletions.
38 changes: 19 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up Python ${{ env.PYTHON_VERSION }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: "${{ env.PYTHON_VERSION }}"

Expand All @@ -46,10 +46,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up Python ${{ env.PYTHON_VERSION }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: "${{ env.PYTHON_VERSION }}"

Expand All @@ -61,7 +61,7 @@ jobs:
run: echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT

- name: Cache pip packages
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ runner.os }}-pip-${{ hashFiles('requirements-dev.txt') }}
Expand All @@ -75,7 +75,7 @@ jobs:
run: make generate-doc

- name: Upload documentation as an artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: doc
path: doc/build/html
Expand All @@ -88,10 +88,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up NodeJS ${{ env.NODE_VERSION }}
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: "${{ env.NODE_VERSION }}"

Expand All @@ -100,7 +100,7 @@ jobs:
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT

- name: Cache Node modules
uses: actions/cache@v2
uses: actions/cache@v3
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
Expand All @@ -118,7 +118,7 @@ jobs:
run: make build-front

- name: Upload font-end assets for subsequent tests
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: assets
path: dist
Expand Down Expand Up @@ -187,10 +187,10 @@ jobs:
tar -xzf geckodriver-v${{ env.GECKODRIVER_VERSION }}-linux64.tar.gz -C geckodriver
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Download previously built assets
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: assets
path: dist
Expand All @@ -204,28 +204,28 @@ jobs:
run: echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT

- name: Cache pip packages
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ runner.os }}-pip-${{ hashFiles('requirements*.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Cache Node modules
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('zmd/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- name: Set up Python ${{ env.PYTHON_VERSION }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: "${{ env.PYTHON_VERSION }}"

- name: Set up NodeJS ${{ env.NODE_VERSION }}
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: "${{ env.NODE_VERSION }}"

Expand Down Expand Up @@ -264,7 +264,7 @@ jobs:

steps:
- name: Set up Python ${{ env.PYTHON_VERSION }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: "${{ env.PYTHON_VERSION }}"

Expand All @@ -285,13 +285,13 @@ jobs:

steps:
- name: Download previously built documentation
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: doc
path: doc/build/html

- name: Deploy to GitHub Pages
uses: JamesIves/github-pages-deploy-action@3.7.1
uses: JamesIves/github-pages-deploy-action@4
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
elasticsearch-dsl==5.4.0
elasticsearch==5.5.3
social-auth-app-django==5.0.0
social-auth-core==4.3.0

# Explicit dependencies (references in code)
beautifulsoup4==4.11.1
Expand Down
2 changes: 0 additions & 2 deletions zds/settings/abstract_base/django.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,6 @@
# 'django.contrib.admindocs',
)

SITE_ID = 1

REST_FRAMEWORK = {
"DEFAULT_PAGINATION_CLASS": "zds.api.pagination.DefaultPagination",
"DEFAULT_SCHEMA_CLASS": "rest_framework.schemas.coreapi.AutoSchema",
Expand Down

0 comments on commit ab81e90

Please sign in to comment.