Merge branch 'DSpace:main' into main

This commit is contained in:
AndrewAlesik
2024-04-09 11:17:36 +02:00
committed by GitHub
6 changed files with 15 additions and 10 deletions

View File

@@ -49,7 +49,7 @@ jobs:
# https://github.com/actions/setup-java # https://github.com/actions/setup-java
- name: Install JDK ${{ matrix.java }} - name: Install JDK ${{ matrix.java }}
uses: actions/setup-java@v3 uses: actions/setup-java@v4
with: with:
java-version: ${{ matrix.java }} java-version: ${{ matrix.java }}
distribution: 'temurin' distribution: 'temurin'
@@ -65,14 +65,14 @@ jobs:
# (This artifact is downloadable at the bottom of any job's summary page) # (This artifact is downloadable at the bottom of any job's summary page)
- name: Upload Results of ${{ matrix.type }} to Artifact - name: Upload Results of ${{ matrix.type }} to Artifact
if: ${{ failure() }} if: ${{ failure() }}
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: ${{ matrix.type }} results name: ${{ matrix.type }} results
path: ${{ matrix.resultsdir }} path: ${{ matrix.resultsdir }}
# Upload code coverage report to artifact, so that it can be shared with the 'codecov' job (see below) # Upload code coverage report to artifact, so that it can be shared with the 'codecov' job (see below)
- name: Upload code coverage report to Artifact - name: Upload code coverage report to Artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: ${{ matrix.type }} coverage report name: ${{ matrix.type }} coverage report
path: 'dspace/target/site/jacoco-aggregate/jacoco.xml' path: 'dspace/target/site/jacoco-aggregate/jacoco.xml'
@@ -91,7 +91,7 @@ jobs:
# Download artifacts from previous 'tests' job # Download artifacts from previous 'tests' job
- name: Download coverage artifacts - name: Download coverage artifacts
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
# Now attempt upload to Codecov using its action. # Now attempt upload to Codecov using its action.
# NOTE: We use a retry action to retry the Codecov upload if it fails the first time. # NOTE: We use a retry action to retry the Codecov upload if it fails the first time.
@@ -101,10 +101,11 @@ jobs:
- name: Upload coverage to Codecov.io - name: Upload coverage to Codecov.io
uses: Wandalen/wretry.action@v1.3.0 uses: Wandalen/wretry.action@v1.3.0
with: with:
action: codecov/codecov-action@v3 action: codecov/codecov-action@v4
# Ensure codecov-action throws an error when it fails to upload # Ensure codecov-action throws an error when it fails to upload
with: | with: |
fail_ci_if_error: true fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}
# Try re-running action 5 times max # Try re-running action 5 times max
attempt_limit: 5 attempt_limit: 5
# Run again in 30 seconds # Run again in 30 seconds

View File

@@ -39,7 +39,7 @@ jobs:
# https://github.com/actions/setup-java # https://github.com/actions/setup-java
- name: Install JDK - name: Install JDK
uses: actions/setup-java@v3 uses: actions/setup-java@v4
with: with:
java-version: 17 java-version: 17
distribution: 'temurin' distribution: 'temurin'

View File

@@ -16,7 +16,7 @@ jobs:
# Only add to project board if issue is flagged as "needs triage" or has no labels # Only add to project board if issue is flagged as "needs triage" or has no labels
# NOTE: By default we flag new issues as "needs triage" in our issue template # NOTE: By default we flag new issues as "needs triage" in our issue template
if: (contains(github.event.issue.labels.*.name, 'needs triage') || join(github.event.issue.labels.*.name) == '') if: (contains(github.event.issue.labels.*.name, 'needs triage') || join(github.event.issue.labels.*.name) == '')
uses: actions/add-to-project@v0.5.0 uses: actions/add-to-project@v1.0.0
# Note, the authentication token below is an ORG level Secret. # Note, the authentication token below is an ORG level Secret.
# It must be created/recreated manually via a personal access token with admin:org, project, public_repo permissions # It must be created/recreated manually via a personal access token with admin:org, project, public_repo permissions
# See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token#permissions-for-the-github_token # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token#permissions-for-the-github_token

View File

@@ -21,4 +21,4 @@ jobs:
# Assign the PR to whomever created it. This is useful for visualizing assignments on project boards # Assign the PR to whomever created it. This is useful for visualizing assignments on project boards
# See https://github.com/toshimaru/auto-author-assign # See https://github.com/toshimaru/auto-author-assign
- name: Assign PR to creator - name: Assign PR to creator
uses: toshimaru/auto-author-assign@v2.0.1 uses: toshimaru/auto-author-assign@v2.1.0

View File

@@ -152,7 +152,7 @@ jobs:
# Upload digest to an artifact, so that it can be used in manifest below # Upload digest to an artifact, so that it can be used in manifest below
- name: Upload Docker build digest to artifact - name: Upload Docker build digest to artifact
if: ${{ ! matrix.isPr }} if: ${{ ! matrix.isPr }}
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: digests-${{ inputs.build_id }} name: digests-${{ inputs.build_id }}
path: /tmp/digests/* path: /tmp/digests/*
@@ -192,7 +192,7 @@ jobs:
- docker-build - docker-build
steps: steps:
- name: Download Docker build digests - name: Download Docker build digests
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: digests-${{ inputs.build_id }} name: digests-${{ inputs.build_id }}
path: /tmp/digests path: /tmp/digests

View File

@@ -1266,6 +1266,8 @@ public class NotifyServiceRestRepositoryIT extends AbstractControllerIntegration
.andExpect(status().isBadRequest()); .andExpect(status().isBadRequest());
} }
// Temporarily disable. See: https://github.com/DSpace/DSpace/issues/9457
@Ignore
@Test @Test
public void NotifyServiceInboundPatternConstraintRemoveOperationTest() throws Exception { public void NotifyServiceInboundPatternConstraintRemoveOperationTest() throws Exception {
@@ -1330,6 +1332,8 @@ public class NotifyServiceRestRepositoryIT extends AbstractControllerIntegration
))); )));
} }
// Temporarily disable. See: https://github.com/DSpace/DSpace/issues/9457
@Ignore
@Test @Test
public void NotifyServiceInboundPatternConstraintRemoveOperationBadRequestTest() throws Exception { public void NotifyServiceInboundPatternConstraintRemoveOperationBadRequestTest() throws Exception {