Skip to content

Commit

Permalink
Merge branch 'develop' into remove-quickfiles-code
Browse files Browse the repository at this point in the history
  • Loading branch information
Johnetordoff authored Sep 17, 2024
2 parents 9d77272 + 63d7f5f commit 7b48a6c
Show file tree
Hide file tree
Showing 87 changed files with 2,034 additions and 1,703 deletions.
6 changes: 3 additions & 3 deletions .github/actions/start-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ runs:
- name: Copy Settings
shell: bash
run: |
cp website/settings/local-travis.py website/settings/local.py
cp api/base/settings/local-travis.py api/base/settings/local.py
cp website/settings/local-ci.py website/settings/local.py
cp api/base/settings/local-ci.py api/base/settings/local.py
mkdir -p ~/preprints
touch ~/preprints/index.html
- name: PIP install
Expand All @@ -41,7 +41,7 @@ runs:
shell: bash
run: |
# bumped psycopg to match requirements.txt, as otherwise build would fail
poetry run python3 -m invoke travis-addon-settings
poetry run python3 -m invoke ci-addon-settings
pip uninstall uritemplate.py --yes
# use yarn add --exact to match versions in yarn.lock w/o installing all deps
yarn add --exact bower@^1.8.8
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- uses: actions/checkout@v2
- uses: ./.github/actions/start-build
- name: Run tests
run: poetry run python3 -m invoke test-travis-addons -n 1 --junit
run: poetry run python3 -m invoke test-ci-addons -n 1 --junit
- name: Upload report
if: (github.event_name != 'pull_request') && (success() || failure()) # run this step even if previous step failed
uses: ./.github/actions/gen-report
Expand All @@ -79,7 +79,7 @@ jobs:
- uses: actions/checkout@v2
- uses: ./.github/actions/start-build
- name: Run tests
run: poetry run python3 -m invoke test-travis-website -n 1 --junit
run: poetry run python3 -m invoke test-ci-website -n 1 --junit
- name: Upload report
if: (github.event_name != 'pull_request') && (success() || failure()) # run this step even if previous step failed
uses: ./.github/actions/gen-report
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
- name: NVM & yarn install
run: poetry run python3 -m invoke assets --dev
- name: Run test
run: poetry run python3 -m invoke test-travis-api1-and-js -n 1 --junit
run: poetry run python3 -m invoke test-ci-api1-and-js -n 1 --junit
- name: Upload report
if: (github.event_name != 'pull_request') && (success() || failure()) # run this step even if previous step failed
uses: ./.github/actions/gen-report
Expand All @@ -135,7 +135,7 @@ jobs:
- uses: actions/checkout@v2
- uses: ./.github/actions/start-build
- name: Run tests
run: poetry run python3 -m invoke test-travis-api2 -n 1 --junit
run: poetry run python3 -m invoke test-ci-api2 -n 1 --junit
- name: Upload report
if: (github.event_name != 'pull_request') && (success() || failure()) # run this step even if previous step failed
uses: ./.github/actions/gen-report
Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
- uses: actions/checkout@v2
- uses: ./.github/actions/start-build
- name: Run tests
run: poetry run python3 -m invoke test-travis-api3-and-osf -n 1 --junit
run: poetry run python3 -m invoke test-ci-api3-and-osf -n 1 --junit
- name: Upload report
if: (github.event_name != 'pull_request') && (success() || failure()) # run this step even if previous step failed
uses: ./.github/actions/gen-report
185 changes: 0 additions & 185 deletions .travis.yml

This file was deleted.

14 changes: 14 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@

We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.

24.06.0 (2024-09-12)
====================

- Fix duplicate notifications for contributor-add failures
- Allow Read and Write contributors to view a project's draft registrations
- Change how files for withdrawn registrations are surfaced in the API
- Fix date displayed in citation for a registration
- New API endpoint /users/me/draft_preprints/
- Add button to admin to move preprint from initial to pending
- Update language in notifications to indicate preprint resubmission
- Fix Preprint emails so they are sent as expected
- Fix ORCiD email by sending them after changes are committed to DB
- Remove references of TravisCI

24.05.0 (2024-07-22)
====================
- Bump base python version from py3.6 to py3.12.
Expand Down
Loading

0 comments on commit 7b48a6c

Please sign in to comment.