Skip to content

Commit

Permalink
update github actions and main watch branch (merge commit)
Browse files Browse the repository at this point in the history
Merge branch 'update/github-actions' into 'main'
* update github actions and main watch branch

See merge request https://gitlab.ci.csc.fi/sds-dev/sd-submit/metadata-submitter-frontend/-/merge_requests/944

Approved-by: Hang Le <[email protected]>
Merged by Stefan Negru <[email protected]>
  • Loading branch information
blankdots committed Apr 4, 2024
2 parents 6b1c0de + d4c82be commit 896dd25
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ updates:
day: "monday"
labels:
- "npm dependencies"
target-branch: "develop"
target-branch: "main"
open-pull-requests-limit: 10
- package-ecosystem: "github-actions"
directory: "/"
Expand All @@ -16,5 +16,5 @@ updates:
day: "monday"
labels:
- "github actions"
target-branch: "develop"
target-branch: "main"
open-pull-requests-limit: 10
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}

# 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@v2
uses: github/codeql-action/autobuild@v3


- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
2 changes: 1 addition & 1 deletion .github/workflows/codestyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: ["16"]
node: ["20"]
name: ESLint check
steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2etests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: ["16"]
node: ["20"]
browser: ["firefox", "chrome"]
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -35,7 +35,7 @@ jobs:
cp -r build/* metadata-submitter/metadata_backend/frontend/
docker-compose -f metadata-submitter/docker-compose.yml --env-file metadata-submitter/.env.example up -d --build
sleep 30
- uses: cypress-io/github-action@v4
- uses: cypress-io/github-action@v6
with:
browser: ${{ matrix.browser }}
env: port=5430
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/formatstyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: ["16"]
node: ["20"]
name: Prettier check
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/typecheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: ["16"]
node: ["20"]
name: TypeScript check
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: ["16"]
node: ["20"]
name: Vitest unit tests and coveralls push
steps:
- uses: actions/checkout@v4
Expand Down
7 changes: 2 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Modify Patch submission with only "name" and "description" #816
- Modified Form layout, Tooltip and Upload XML according to new UI design #811

#### Changed

- Change the way to add DOI form to submission with new endpoint "/doi"

- Change the way to add DOI form to submission with new endpoint "/doi"
- Change url of ROR from http to https #813
- Refactor **folder** -> **submission** #807
- Renamed "NewDraft" to "Submission" to all existing components and routes and related tests.
Expand All @@ -25,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Update json-schema-ref-parser to latest stable version 11.5.4
- Use Vite as the new bundle tool to replace CRA and Webpack
- Use Vitest for unit tests instead of Jest
- github action updates as well as dependabot watched branch

### Added

Expand Down

0 comments on commit 896dd25

Please sign in to comment.