diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 280b7fea..d640fb4e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -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: "/" @@ -16,5 +16,5 @@ updates: day: "monday" labels: - "github actions" - target-branch: "develop" + target-branch: "main" open-pull-requests-limit: 10 diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index c347934b..54f370bb 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -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 diff --git a/.github/workflows/codestyle.yml b/.github/workflows/codestyle.yml index e66b16bc..0b0ede98 100644 --- a/.github/workflows/codestyle.yml +++ b/.github/workflows/codestyle.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: ["16"] + node: ["20"] name: ESLint check steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/e2etests.yml b/.github/workflows/e2etests.yml index 1d057848..f7b89833 100644 --- a/.github/workflows/e2etests.yml +++ b/.github/workflows/e2etests.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: ["16"] + node: ["20"] browser: ["firefox", "chrome"] steps: - uses: actions/checkout@v4 @@ -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 diff --git a/.github/workflows/formatstyle.yml b/.github/workflows/formatstyle.yml index 930f9bea..f1900c34 100644 --- a/.github/workflows/formatstyle.yml +++ b/.github/workflows/formatstyle.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: ["16"] + node: ["20"] name: Prettier check steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml index 76647b1d..a087e949 100644 --- a/.github/workflows/typecheck.yml +++ b/.github/workflows/typecheck.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: ["16"] + node: ["20"] name: TypeScript check steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 85871fd8..7479af97 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index ede5a8c3..543d4bfb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. @@ -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