Skip to content

Commit 6e9f8cf

Browse files
Merge branch 'main' of dspace:pzlakowski/dspace-angular
2 parents b96d78b + 1ff8f45 commit 6e9f8cf

18 files changed

Lines changed: 306 additions & 259 deletions

.github/workflows/build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
steps:
5252
# https://github.com/actions/checkout
5353
- name: Checkout codebase
54-
uses: actions/checkout@v4
54+
uses: actions/checkout@v6
5555

5656
# https://github.com/actions/setup-node
5757
- name: Install Node.js ${{ matrix.node-version }}
@@ -113,7 +113,7 @@ jobs:
113113
# so that it can be shared with the 'codecov' job (see below)
114114
# NOTE: Angular CLI only supports code coverage for specs. See https://github.com/angular/angular-cli/issues/6286
115115
- name: Upload code coverage report to Artifact
116-
uses: actions/upload-artifact@v4
116+
uses: actions/upload-artifact@v7
117117
if: matrix.node-version == '20.x'
118118
with:
119119
name: coverage-report-${{ matrix.node-version }}
@@ -155,7 +155,7 @@ jobs:
155155
# Cypress always creates a video of all e2e tests (whether they succeeded or failed)
156156
# Save those in an Artifact
157157
- name: Upload e2e test videos to Artifacts
158-
uses: actions/upload-artifact@v4
158+
uses: actions/upload-artifact@v7
159159
if: always()
160160
with:
161161
name: e2e-test-videos-${{ matrix.node-version }}
@@ -164,7 +164,7 @@ jobs:
164164
# If e2e tests fail, Cypress creates a screenshot of what happened
165165
# Save those in an Artifact
166166
- name: Upload e2e test failure screenshots to Artifacts
167-
uses: actions/upload-artifact@v4
167+
uses: actions/upload-artifact@v7
168168
if: failure()
169169
with:
170170
name: e2e-test-screenshots-${{ matrix.node-version }}
@@ -316,19 +316,19 @@ jobs:
316316
runs-on: ubuntu-latest
317317
steps:
318318
- name: Checkout
319-
uses: actions/checkout@v4
319+
uses: actions/checkout@v6
320320

321321
# Download artifacts from previous 'tests' job
322322
- name: Download coverage artifacts
323-
uses: actions/download-artifact@v4
323+
uses: actions/download-artifact@v8
324324

325325
# Now attempt upload to Codecov using its action.
326326
# NOTE: We use a retry action to retry the Codecov upload if it fails the first time.
327327
#
328328
# Retry action: https://github.com/marketplace/actions/retry-action
329329
# Codecov action: https://github.com/codecov/codecov-action
330330
- name: Upload coverage to Codecov.io
331-
uses: Wandalen/wretry.action@v1.3.0
331+
uses: Wandalen/wretry.action@v3.8.0
332332
with:
333333
action: codecov/codecov-action@v4
334334
# Ensure codecov-action throws an error when it fails to upload

.github/workflows/codescan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
steps:
3636
# https://github.com/actions/checkout
3737
- name: Checkout repository
38-
uses: actions/checkout@v4
38+
uses: actions/checkout@v6
3939

4040
# Initializes the CodeQL tools for scanning.
4141
# https://github.com/github/codeql-action

.github/workflows/docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ jobs:
7777
steps:
7878
# Checkout our codebase (to get access to Docker Compose scripts)
7979
- name: Checkout codebase
80-
uses: actions/checkout@v4
80+
uses: actions/checkout@v6
8181
# Download Docker image artifacts (which were just built by reusable-docker-build.yml)
8282
- name: Download Docker image artifacts
83-
uses: actions/download-artifact@v4
83+
uses: actions/download-artifact@v8
8484
with:
8585
# Download all amd64 Docker images (TAR files) into the /tmp/docker directory
8686
pattern: docker-image-*-linux-amd64

.github/workflows/issue_opened.yml

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

.github/workflows/port_merged_pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
if: github.event.pull_request.merged
2424
steps:
2525
# Checkout code
26-
- uses: actions/checkout@v4
26+
- uses: actions/checkout@v6
2727
# Port PR to other branch (ONLY if labeled with "port to")
2828
# See https://github.com/korthout/backport-action
2929
- name: Create backport pull requests

.github/workflows/pull_request_opened.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
# Assign the PR to whomever created it. This is useful for visualizing assignments on project boards
2222
# See https://github.com/toshimaru/auto-author-assign
2323
- name: Assign PR to creator
24-
uses: toshimaru/auto-author-assign@v2.1.0
24+
uses: toshimaru/auto-author-assign@v3.0.1

lint/src/rules/html/no-disabled-attribute-on-button.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ export const info = {
3838
} as DSpaceESLintRuleInfo;
3939

4040
export const rule = ESLintUtils.RuleCreator.withoutDocs({
41-
...info,
41+
meta: info.meta,
42+
defaultOptions: info.defaultOptions,
4243
create(context: TSESLint.RuleContext<Message, unknown[]>) {
4344
const parserServices = getSourceCode(context).parserServices as TemplateParserServices;
4445

lint/src/rules/html/themed-component-usages.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ The only exception to this rule are unit tests, where we may want to use the bas
5353
} as DSpaceESLintRuleInfo;
5454

5555
export const rule = ESLintUtils.RuleCreator.withoutDocs({
56-
...info,
56+
meta: info.meta,
57+
defaultOptions: info.defaultOptions,
5758
create(context: RuleContext<Message, unknown[]>): RuleListener {
5859
if (getFilename(context).includes('.spec.ts')) {
5960
// skip inline templates in unit tests

lint/src/rules/ts/alias-imports.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ export const info: DSpaceESLintRuleInfo<[AliasImportOptions], [AliasImportDocOpt
8888
};
8989

9090
export const rule = ESLintUtils.RuleCreator.withoutDocs({
91-
...info,
91+
meta: info.meta,
92+
defaultOptions: info.defaultOptions,
9293
create(context: TSESLint.RuleContext<Message, unknown[]>, options: any) {
9394
return (options[0] as AliasImportOptions).aliases.reduce((selectors: any, option: AliasImportOption) => {
9495
selectors[`ImportDeclaration[source.value = "${option.package}"] > ImportSpecifier[imported.name = "${option.imported}"][local.name != "${option.local}"]`] = (node: TSESTree.ImportSpecifier) => handleUnaliasedImport(context, option, node);

lint/src/rules/ts/no-default-standalone-value.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ export const info: DSpaceESLintRuleInfo = {
3535
};
3636

3737
export const rule = ESLintUtils.RuleCreator.withoutDocs({
38-
...info,
38+
meta: info.meta,
39+
defaultOptions: info.defaultOptions,
3940
create(context: RuleContext<any, any>, options: any) {
4041
return {
4142
['ClassDeclaration > Decorator > CallExpression[callee.name="Component"] > ObjectExpression > Property[key.name="standalone"]']: (node: TSESTree.Property) => {

0 commit comments

Comments
 (0)