Skip to content
This repository has been archived by the owner on Oct 23, 2023. It is now read-only.

Commit

Permalink
Merge pull request #663 from CSCfi/dev
Browse files Browse the repository at this point in the history
release v1.6.2
  • Loading branch information
teemukataja authored Oct 17, 2022
2 parents 2b8577a + bbefd61 commit 0b6eca2
Show file tree
Hide file tree
Showing 6 changed files with 479 additions and 392 deletions.
1 change: 1 addition & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ updates:
day: "monday"
labels:
- "github actions"
target-branch: "dev"
open-pull-requests-limit: 10
1 change: 0 additions & 1 deletion .github/workflows/E2Etests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ jobs:
uses: cypress-io/github-action@v4
with:
browser: ${{ matrix.browser }}
headless: true
- uses: actions/upload-artifact@v3
if: failure()
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ jobs:
steps:
- name: Dependabot metadata
id: metadata
uses: dependabot/[email protected].3
uses: dependabot/[email protected].4
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Wait other jobs are passed or failed
if: ${{ contains(github.event.pull_request.labels.*.name, 'npm dependencies') || contains(github.event.pull_request.labels.*.name, 'github actions') }}
if: ${{ steps.metadata.outputs.package-ecosystem == 'npm_and_yarn' || steps.metadata.outputs.package-ecosystem == 'github_actions' }}
uses: kachick/wait-other-jobs@v1
timeout-minutes: 30
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Enable auto-merge for Dependabot PRs
if: ${{ contains(github.event.pull_request.labels.*.name, 'npm dependencies') || contains(github.event.pull_request.labels.*.name, 'github actions') }}
if: ${{ steps.metadata.outputs.package-ecosystem == 'npm_and_yarn' || steps.metadata.outputs.package-ecosystem == 'github_actions' }}
run: gh pr review --approve "$PR_URL" && gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Setup node ${{ matrix.node }}
uses: actions/setup-node@v3.4.1
uses: actions/setup-node@v3.5.1
with:
node-version: ${{ matrix.node-version }}
- name: Install dependencies and coveralls
Expand Down
Loading

0 comments on commit 0b6eca2

Please sign in to comment.