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.

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 to main to release v5.3.0 #3567

Merged
merged 162 commits into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
162 commits
Select commit Hold shift + click to select a range
42e213d
fix kbaseTabs behaving incorrectly when a deletable tab is deleted [P…
eapearson Jan 3, 2023
9ffb219
improve some internal comments [PTV-1845]
eapearson Jan 3, 2023
e3ab9f2
use $el(), revert comment change [PTV-1845]
eapearson Jan 3, 2023
3d60cf0
improve initial code documentation [PTV-1845]
eapearson Jan 3, 2023
2a59944
refactor one test pattern into function [PTV-1845]
eapearson Jan 3, 2023
c2f2003
some consolidation of shared test code [PTV-1845]
eapearson Jan 3, 2023
6e946c8
Dry out tests some more [PTV-1845]
eapearson Jan 3, 2023
4c9e0fc
more test DRYing [PTV-1845]
eapearson Jan 3, 2023
acbcd8f
improve test [PTV-1845]
eapearson Jan 3, 2023
04c80b2
updating python deps for Nov 2023, reformatting one file that had gon…
ialarmedalien Nov 8, 2023
a37bd72
Merge pull request #3384 from kbase/nov_2023_py_deps
briehl Nov 9, 2023
b982e48
add user and wsid to job output
ialarmedalien Nov 9, 2023
16b4c20
Merge pull request #3386 from kbase/DATAUP-765_add_wsid_to_job
ialarmedalien Nov 16, 2023
ecf0c31
add user and wsid to job output
ialarmedalien Nov 9, 2023
9c2ec3d
Convert most of the unittest-based tests to plain `assert` or `pytest…
ialarmedalien Nov 13, 2023
3487342
Merge branch 'develop' into DATAUP-765_assertify
ialarmedalien Dec 22, 2023
7840bf1
Fixing a couple of code hygiene issues
ialarmedalien Dec 22, 2023
af90f5f
Merge pull request #3389 from kbase/DATAUP-765_assertify
briehl Dec 22, 2023
540876e
fix typos and improve [PTV-1845]
eapearson Jan 8, 2024
ed15376
improve comment formatting - specifically keep the lines short [PTV-1…
eapearson Jan 8, 2024
0617639
finish conversion to using an updated kbasePrompt [PTV-1845]
eapearson Jan 8, 2024
61a3035
added gallery examples for tabs, confirmation prompt, prompt [PTV-1845]
eapearson Jan 8, 2024
355db2e
add "waitForText" to test utilities [PTV-1845]
eapearson Jan 9, 2024
e31cbf8
add tests for kbasePrompt2 and kbaseConfirmationPrompt [PTV-1845]
eapearson Jan 9, 2024
cf22f0a
remove modal after dialog closes [PTV-1845]
eapearson Jan 9, 2024
d21f08e
unfocus these tests [PTV-1845]
eapearson Jan 9, 2024
71c9096
fix broken test [PTV-1845]
eapearson Jan 9, 2024
07100c1
fix tests; broken by clear button text [PTV-1845]
eapearson Jan 9, 2024
fc4bb76
jquery-nearest missing amd dependency [PTV-1845]
eapearson Jan 9, 2024
0c0df25
merge latest develop + merge conflict resolution + fix linting issues…
eapearson Jan 9, 2024
67cfd2c
Merge remote-tracking branch 'origin/develop' into PTV-1845
eapearson Jan 9, 2024
9017420
fix typo and wrap comments narrower [PTV-1845]
eapearson Jan 9, 2024
f1c5745
move direct style into stylesheet [PTV-1845]
eapearson Jan 9, 2024
3ab5ac4
silly autoformatter [PTV-1845]
eapearson Jan 9, 2024
238d81e
will this make sonarcloud happier? [PTV-1845]
eapearson Jan 9, 2024
ca7d223
a double equals slipped through [PTV-1846]
eapearson Jan 9, 2024
7259f7e
ridiculous remark complaints perhaps fixed [PTV-1846]
eapearson Jan 9, 2024
f354df6
move multi-part conditional sequence in to sequence of simple if stat…
eapearson Jan 11, 2024
e6babe1
Improve exactly in initial module documentation example [PTV-1845]
eapearson Jan 11, 2024
504853c
remove incomplete sentence [PTV-1845]
eapearson Jan 11, 2024
fa6e1d0
move gallery css to scss, remove unused class, improve tab close butt…
eapearson Jan 16, 2024
62dbdb1
is this md formatter better? [PTV-1845]
eapearson Jan 16, 2024
517659b
argh more md formatting tweaks? [PTV-1845]
eapearson Jan 16, 2024
e069985
change top level class name [PTV-1845]
eapearson Jan 16, 2024
9830bfb
more small changes to satisfy sonarcloud [PTV-1845]
eapearson Jan 16, 2024
1316a4c
Merge pull request #3174 from kbase/PTV-1845
briehl Jan 29, 2024
4774855
Adding typing and some documentation to the specmanager class
ialarmedalien Feb 27, 2024
123069f
Updating python deps for Feb 2024
ialarmedalien Feb 27, 2024
a27a945
Merge pull request #3440 from kbase/misc_typing_additions
ialarmedalien Feb 27, 2024
08f1e4f
Updating JS deps for Feb 2024
ialarmedalien Feb 27, 2024
9f58fc9
Merge pull request #3441 from kbase/python_deps_02_2024
ialarmedalien Feb 28, 2024
b2af9ce
Merge pull request #3442 from kbase/js_deps_02_2024
briehl Mar 11, 2024
e993769
token revoke should be awaited [PTV-1909]
eapearson Mar 28, 2024
0bf9a72
revert msw version bump; doesn't have umd build; require node 20; reb…
eapearson Mar 28, 2024
9a9a237
update image node to 20, install deps with ci [PTV-1909]
eapearson Mar 28, 2024
882aecc
use domain for cookie to match Europa, fix token revoke api call [PTV…
eapearson Mar 28, 2024
7073963
gha test code needs to use node 20 [PTV-1909]
eapearson Mar 28, 2024
0677384
silly husky reformatted, so keep it to prevent spam [PTV-1909]
eapearson Mar 28, 2024
d7c57d4
update release notes [PTV-1909]
eapearson Mar 28, 2024
d4fb1a7
fix typo in setup-node version [PTV-1909]
eapearson Mar 28, 2024
810cc76
fix version for setup-node in GHA workflow [PTV-1909]
eapearson Mar 28, 2024
5f2f0fb
address security flag by adding "ignore-scripts" option [PTV-1909]
eapearson Mar 28, 2024
cdc1354
safer usage of apt-get install [PTV-1909]
eapearson Mar 28, 2024
3344355
run apt-get clean after install to remove unnecessary files [PTV-1909]
eapearson Mar 28, 2024
3387ab7
Merge pull request #3443 from kbase/PTV-1909
briehl Apr 1, 2024
03c0dcc
add more cases for undoing refs
briehl Feb 21, 2024
68b1101
fix dropzone failure due to update
briehl Apr 1, 2024
dd4e49d
fix kbasePrompt2 properly removing modal div on close, inputUtilsSpec…
briehl Apr 4, 2024
bc090f1
make kbasePrompt2 tests clean up after themselves
briehl Apr 4, 2024
ff20cf6
fix userMenu tests
briehl Apr 4, 2024
43bdea7
add datatables.net-buttons to package.json to lock the version
briehl Apr 4, 2024
6a75322
fix package.json typo regression
briehl Apr 4, 2024
b31d43d
update package-lock
briehl Apr 4, 2024
c6e1add
Merge pull request #3444 from kbase/fix-dropzone
briehl Apr 5, 2024
af9c686
update jupyter to 6.5.6
briehl Apr 5, 2024
d235c50
add empty custom-preload file
briehl Apr 5, 2024
5035c28
update release notes
briehl Apr 5, 2024
fc426d9
update start_docker_narrative to use new config
briehl Apr 5, 2024
63566b7
fix incorrect-ish config item
briehl Apr 8, 2024
6750ee8
add codecov_token to GHA step
briehl Apr 8, 2024
483d929
Merge pull request #3454 from kbase/update_notebook
briehl Apr 18, 2024
e21fd31
Fixing a semicolon in the dockerfile that was masking error states
ialarmedalien Apr 22, 2024
cb155c3
Merge pull request #3457 from kbase/fix_semi_colon_error_masking
briehl Apr 22, 2024
04ab799
remove nodejs install from dockerfile
ialarmedalien Apr 22, 2024
8591a39
Merge pull request #3458 from kbase/remove_nodejs_install
ialarmedalien Apr 22, 2024
4ec0876
use the latest version of the narrative base image
ialarmedalien Apr 22, 2024
c75f902
Merge pull request #3459 from kbase/use_latest_narr_base_image
briehl Apr 22, 2024
7234756
add python Docker dependencies
briehl Apr 22, 2024
353ec22
rearrange dockerfile
briehl Apr 22, 2024
1848d10
Merge pull request #3460 from kbase/add-python-dep-install
briehl Apr 22, 2024
ef79841
Removing obsolete code to build documents
ialarmedalien Apr 23, 2024
eec0e76
Adding github actions to dependabot
ialarmedalien Apr 24, 2024
e233fb0
Merge pull request #3467 from kbase/add_github_actions_to_dependabot
briehl Apr 24, 2024
cd2b17d
Updating github action versions and removing unused files
ialarmedalien Apr 24, 2024
a7bf677
Merge pull request #3490 from kbase/update_gha
briehl Apr 24, 2024
6e9f737
update python dependency workings, installation, docker build
briehl Apr 24, 2024
26af1c9
update base image to 8.0.0
briehl Apr 24, 2024
a99197c
more updates, migrade jupyter-pip-requirements.txt to just requiremen…
briehl Apr 25, 2024
ccaf0b4
add missing new requirements-dev.txt
briehl Apr 25, 2024
be7a7ba
recombine python dependencies and narrative image python dependencies
briehl Apr 26, 2024
b233d5e
update dependabot config to be (hopefully) less annoying
briehl Apr 26, 2024
8f0a9d6
Merge pull request #3491 from kbase/resolve-python-dep-install
ialarmedalien Apr 28, 2024
31128f1
Merge pull request #3492 from kbase/update-dependabot
briehl Apr 29, 2024
d39ca7c
Merge pull request #3466 from kbase/remove_build_docs
briehl Apr 29, 2024
5cf95cc
Alter vcrpy config to ignore the "id" in each request
ialarmedalien Apr 30, 2024
2163b2e
removing commented-out text
ialarmedalien Apr 30, 2024
50a1237
removing pytest-recording command
ialarmedalien Apr 30, 2024
6c81700
using pytest-recording plugin and moving files to default locations
ialarmedalien Apr 30, 2024
cc52b42
A few minor tweaks
ialarmedalien May 6, 2024
0abd60f
Updatng python deps for Apr 30; also some misc code cleanup, adding t…
ialarmedalien May 7, 2024
c970b73
Adding ruff config and running format and linter over all files. This…
ialarmedalien May 14, 2024
38ff5cb
Merge pull request #3499 from kbase/update_vcrpy
briehl May 14, 2024
32943e1
Merge pull request #3500 from kbase/python_deps_apr_30
briehl May 14, 2024
a15e853
Ruff infrastructure
ialarmedalien May 14, 2024
71a8112
Merge pull request #3518 from kbase/ruff_ruff
briehl May 14, 2024
5919c5e
Formatting and auto-fixing lint errors. No human (or alien) intervent…
ialarmedalien May 14, 2024
a0d3011
updating docs around linting/formatting
ialarmedalien May 14, 2024
e6da20a
Merge branch 'develop' into ruff
ialarmedalien May 14, 2024
8325b76
Merge pull request #3519 from kbase/ruff
briehl May 14, 2024
19d9185
Merge branch 'develop' into ruff_lint_the_rest
ialarmedalien May 14, 2024
9af7c82
Merge pull request #3524 from kbase/ruff_lint_the_rest
ialarmedalien May 14, 2024
69879e9
Updating codecov call and passing in secret in the vain hope that it …
ialarmedalien May 14, 2024
44fe25d
Merge pull request #3525 from kbase/fix_codecov
briehl May 15, 2024
7fb13e5
add regression test for download path from report
briehl May 16, 2024
694db68
integrating separate css files into scss
ialarmedalien May 29, 2024
49aaa0f
fixing case of font names (not that it matters)
ialarmedalien May 29, 2024
c3cdf57
Merge branch 'develop' into UIP-47_consolidate_css
ialarmedalien May 29, 2024
06153be
Merge pull request #3528 from kbase/UIP-47_consolidate_css
ialarmedalien May 30, 2024
9a2e6c1
Mostly documentation and typing changes.
ialarmedalien May 31, 2024
61a42b6
set up OK, error during execution
ialarmedalien Jun 1, 2024
8df8470
Merge pull request #3529 from kbase/more_typing_and_docs
ialarmedalien Jun 3, 2024
1f6e551
remove unit test class, de-indent tests, big search and replace to ch…
ialarmedalien Jun 2, 2024
99c4f1f
fixing lots of little bits and pieces in the tests
ialarmedalien Jun 2, 2024
dca0e3f
Merge pull request #3548 from kbase/declassing_jobcomm
ialarmedalien Jun 4, 2024
ca69e28
Updating clustergrammer widget to v2 and un-skip clustergrammer test
ialarmedalien Jun 4, 2024
84e05a3
Update the requirements file and the release notes doc
ialarmedalien Jun 4, 2024
9438206
Merge pull request #3549 from kbase/update_clustergrammer
ialarmedalien Jun 4, 2024
2e12a85
using newer "create_comm" function in place of antiquated "Comm()" call
ialarmedalien Jun 4, 2024
f56890d
Updating python deps for June 2024
ialarmedalien Jun 4, 2024
8c1a4a7
Merge pull request #3552 from kbase/python_updates
ialarmedalien Jun 4, 2024
174e0cb
Use full paths to modules
ialarmedalien Jun 5, 2024
900d25a
move clients to 'installed_clients' dir and update code. Delete old s…
ialarmedalien Jun 5, 2024
aa67a64
Cache clients
ialarmedalien Jun 5, 2024
b401562
Merge pull request #3556 from kbase/update_clients
ialarmedalien Jun 7, 2024
0729a26
Updating a variety of files; moving the python requirements into the …
ialarmedalien Jun 7, 2024
b5cf3ac
moving python-rqts file to the correct location
ialarmedalien Jun 7, 2024
59f5454
Merge pull request #3558 from kbase/random_updates
ialarmedalien Jun 11, 2024
dd5b0f5
Updating versions of github actions
ialarmedalien Jun 11, 2024
ea357e1
Merge pull request #3561 from kbase/update_github_actions
ialarmedalien Jun 11, 2024
df9e4b1
v1 of updating JS deps
ialarmedalien Jun 12, 2024
7ba0cdc
find compatible version of msw
ialarmedalien Jun 12, 2024
5bb158c
find compatible version of expect-webdriverio
ialarmedalien Jun 12, 2024
0f16e38
Use NotebookApp instead of ServerApp
ialarmedalien Jun 12, 2024
c6fe5d9
Removing setup.py and ez_setup.py
ialarmedalien Jun 12, 2024
53b6896
Merge pull request #3562 from kbase/UIP-47_update_JS_deps
briehl Jun 13, 2024
90ed91a
Merge branch 'develop' into remove_setup_py
ialarmedalien Jun 13, 2024
2574453
Reverting notebook extensions
ialarmedalien Jun 13, 2024
775e9e1
remove cache decorator
ialarmedalien Jun 13, 2024
476bd09
Merge pull request #3559 from kbase/remove_setup_py
ialarmedalien Jun 14, 2024
e188aa3
Merge pull request #3526 from kbase/UIP-42-remove-die
briehl Jun 17, 2024
bcc9913
bump version to 5.3.0
briehl Jun 25, 2024
6eb978a
Merge pull request #3566 from kbase/bump-version
briehl Jun 25, 2024
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
8 changes: 7 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Dockerfile
Dockerfile*
.husky
.github
.vscode
Expand All @@ -8,3 +8,9 @@ node_modules/
**/__pycache__
karma-result.json
install.log
**/.pytest_cache
.ruff*
.eslint*
.prettier*
.stylelintrc*
.coverage*
17 changes: 0 additions & 17 deletions .flake8

This file was deleted.

12 changes: 5 additions & 7 deletions .github/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: "Code scanning - action"
on:
push:
pull_request:
schedule:
- cron: '0 19 * * 0'

jobs:
CodeQL-Build:
Expand All @@ -14,7 +12,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
Expand All @@ -24,18 +22,18 @@ jobs:
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v3
# Override language selection by uncommenting this and choosing your languages
# with:
# languages: go, javascript, csharp, python, cpp, java

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -49,4 +47,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v3
17 changes: 17 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,33 @@ updates:
schedule:
interval: monthly
time: '11:00'
groups:
python-dependencies:
patterns:
- "*"
open-pull-requests-limit: 20
ignore:
- dependency-name: "notebook"
versions: '>= 7.0.0'
- package-ecosystem: npm
directory: "/"
schedule:
interval: monthly
time: '11:00'
groups:
npm-dependencies:
patterns:
"*"
open-pull-requests-limit: 20
- package-ecosystem: docker
directory: "/"
schedule:
interval: monthly
time: '11:00'
open-pull-requests-limit: 20
- package-ecosystem: github-actions
directory: "/.github"
schedule:
interval: monthly
time: '11:00'
open-pull-requests-limit: 20
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Related Jira ticket: https://kbase-jira.atlassian.net/browse/DATAUP-X
- [ ] I have added tests that prove my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] (JavaScript) I have run Prettier and ESLint on changed code manually or with a git precommit hook
- [ ] (Python) I have run Black and Flake8 on changed Python code manually or with a git precommit hook
- [ ] (Python) I have run Ruff `format` and `check` on changed Python code manually or with a git precommit hook
- [ ] Any dependent changes have been merged and published in downstream modules

# Updating Version and Release Notes (if applicable)
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build_and_push_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
name: Check out GitHub Repo
with:
ref: "${{ github.event.pull_request.head.sha }}"
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Set up environment
run: |
Expand All @@ -42,17 +42,17 @@ jobs:
run: echo "date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
-
name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ secrets.GHCR_USERNAME }}
password: ${{ secrets.GHCR_TOKEN }}
-
name: Build narrative image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfile
Expand All @@ -67,7 +67,7 @@ jobs:
TAG='${{ github.ref }}'
-
name: Build version image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
if: ${{ github.base_ref }} == 'main' || ${{ github.base_ref }} == 'develop'
with:
context: .
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build_prodrc_pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
secrets:
GHCR_USERNAME: ${{ secrets.GHCR_USERNAME }}
GHCR_TOKEN: ${{ secrets.GHCR_TOKEN }}
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

run_integration_tests:
uses: ./.github/workflows/integration_test.yml
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build_test_pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
GHCR_TOKEN: ${{ secrets.GHCR_TOKEN }}

trivy-scans:
if: (github.base_ref == 'develop' || github.base_ref == 'main' || github.base_ref == 'master' ) && github.event.pull_request.merged == false
if: (github.base_ref == 'develop' || github.base_ref == 'main' ) && github.event.pull_request.merged == false
uses: kbase/.github/.github/workflows/reusable_trivy-scans.yml@main
secrets: inherit

Expand All @@ -27,6 +27,7 @@ jobs:
secrets:
GHCR_USERNAME: ${{ secrets.GHCR_USERNAME }}
GHCR_TOKEN: ${{ secrets.GHCR_TOKEN }}
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

run_integration_tests:
uses: ./.github/workflows/integration_test.yml
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/integration_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ jobs:
steps:
-
name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ secrets.GHCR_USERNAME }}
password: ${{ secrets.GHCR_TOKEN }}
-
name: Repo checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Set up environment
run: |
Expand All @@ -47,10 +47,10 @@ jobs:
shell: bash -l {0}
run: docker pull ${{ env.APP_IMAGE_TAG }}
-
name: Use Node JS 16
uses: actions/setup-node@v3
name: Use Node JS 20
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
-
name: Install JS dependencies
run: |
Expand Down
23 changes: 0 additions & 23 deletions .github/workflows/manual_build.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/pr_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,20 @@ jobs:
tags: pr-${{ github.event.number }},latest
secrets: inherit
build-main-open:
if: (github.base_ref == 'main' || github.base_ref == 'master') && github.event.pull_request.merged == false
if: github.base_ref == 'main' && github.event.pull_request.merged == false
uses: kbase/.github/.github/workflows/reusable_build-push.yml@main
with:
name: '${{ github.event.repository.name }}'
tags: pr-${{ github.event.number }}
secrets: inherit
build-main-merge:
if: (github.base_ref == 'main' || github.base_ref == 'master') && github.event.pull_request.merged == true
if: github.base_ref == 'main' && github.event.pull_request.merged == true
uses: kbase/.github/.github/workflows/reusable_build-push.yml@main
with:
name: '${{ github.event.repository.name }}'
tags: pr-${{ github.event.number }},latest-rc
secrets: inherit
trivy-scans:
if: (github.base_ref == 'develop' || github.base_ref == 'main' || github.base_ref == 'master' ) && github.event.pull_request.merged == false
if: (github.base_ref == 'develop' || github.base_ref == 'main') && github.event.pull_request.merged == false
uses: kbase/.github/.github/workflows/reusable_trivy-scans.yml@main
secrets: inherit
3 changes: 0 additions & 3 deletions .github/workflows/release-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
name: Release - Build & Push Image
on:
release:
branches:
- main
- master
types: [ published ]
jobs:
check-source-branch:
Expand Down
35 changes: 0 additions & 35 deletions .github/workflows/tag_environments.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/tag_latest_image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
- name: Check out GitHub Repo
with:
ref: "${{ github.event.pull_request.head.sha }}"
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ secrets.GHCR_USERNAME }}
Expand Down
17 changes: 10 additions & 7 deletions .github/workflows/unit_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,23 @@ on:
required: true
GHCR_TOKEN:
required: true
CODECOV_TOKEN:
required: true

jobs:
run_unit_tests:
runs-on: ubuntu-latest
steps:
-
name: Log in to the Container registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ secrets.GHCR_USERNAME }}
password: ${{ secrets.GHCR_TOKEN }}
-
name: Repo checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Set up environment
run: |
Expand Down Expand Up @@ -52,13 +54,13 @@ jobs:
mkdir -p ${{ github.workspace }}/output
sudo chown nobody ${{ github.workspace }}/output
sudo chmod -R 0777 ${{ github.workspace }}/output
docker run -v "${{ github.workspace }}/output:/tmp/output" --user nobody ${{ env.APP_IMAGE_TAG }} /bin/bash scripts/narrative_backend_tests.sh
docker run -v "${{ github.workspace }}/output:/tmp/output" --user nobody ${{ env.APP_IMAGE_TAG }} /bin/bash scripts/run_backend_tests.sh
continue-on-error: true
-
name: Use Node JS 16
uses: actions/setup-node@v2
name: Use Node JS 20
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
-
name: Install JS dependencies
run: |
Expand All @@ -74,9 +76,10 @@ jobs:
-
name: Send to Codecov
id: send_to_codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
continue-on-error: true
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./output/coverage.xml,./js-coverage/lcov/lcov.info
fail_ci_if_error: true
-
Expand Down
2 changes: 0 additions & 2 deletions .isort.cfg

This file was deleted.

Loading
Loading