Skip to content

Commit

Permalink
Merge branch 'main' into static-scanning
Browse files Browse the repository at this point in the history
Signed-off-by: Justin Abrahms <[email protected]>
  • Loading branch information
justinabrahms authored Oct 5, 2022
2 parents a5ac4da + faca917 commit 6b3f5f1
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 7 deletions.
16 changes: 16 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
version: 2
updates:

# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"

# Maintain dependencies for npm
- package-ecosystem: "maven"
directory: "/"
commit-message:
prefix: "chore"
schedule:
interval: "weekly"
3 changes: 2 additions & 1 deletion .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@ on:
branches: [ master, main ]

permissions:
packages: write
contents: read

jobs:
build:

runs-on: ubuntu-latest
permissions:
packages: write

steps:
- uses: actions/checkout@v3
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/pullrequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ on:
pull_request:
branches: [ master, main ]
permissions:
packages: write
contents: read

jobs:
Expand All @@ -15,6 +14,8 @@ jobs:
ports:
- 8013:8013

permissions:
packages: write
steps:
- name: Check out the code
uses: actions/checkout@v3
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/static-code-scanning.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ name: "Code Scanning - Action"
# Docs for this at https://github.com/github/codeql-action#usage

on:
# push:
# branches: [main]
# pull_request:
# branches: [main]
schedule:
# ┌───────────── minute (0 - 59)
# │ ┌───────────── hour (0 - 23)
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-bom</artifactId>
<version>7.8.0</version>
<version>7.8.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down

0 comments on commit 6b3f5f1

Please sign in to comment.