Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into bug/backup
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
#	docker/backup/Dockerfile
  • Loading branch information
dabico committed Aug 13, 2024
2 parents 57cdce6 + 8e2283e commit b4c6468
Show file tree
Hide file tree
Showing 79 changed files with 2,617 additions and 2,597 deletions.
36 changes: 18 additions & 18 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,24 @@ updates:
target-branch: master
labels:
- dependencies
#
# FIXME: These require more robust upgrades
#
# - package-ecosystem: docker
# directory: /docker/database
# schedule:
# interval: daily
# target-branch: master
# labels:
# - dependencies
# - package-ecosystem: docker
# directory: /docker/migration
# schedule:
# interval: daily
# target-branch: master
# labels:
# - dependencies
#
#
# FIXME: These require more robust upgrades
#
# - package-ecosystem: docker
# directory: /docker/database
# schedule:
# interval: daily
# target-branch: master
# labels:
# - dependencies
# - package-ecosystem: docker
# directory: /docker/migration
# schedule:
# interval: daily
# target-branch: master
# labels:
# - dependencies
#
- package-ecosystem: docker
directory: /docker/server
schedule:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/checkstyle.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
name: 'Check Java files with CheckStyle'
name: "Check Java files with CheckStyle"
on:
pull_request:
paths:
- '**/*.java'
- "**/*.java"

jobs:
checkstyle:
runs-on: ubuntu-latest
steps:
- name: Setup Maven
uses: s4u/setup-maven-action@v1.13.0
uses: s4u/setup-maven-action@v1.14.0
- name: Run CheckStyle
uses: nikitasavinov/checkstyle-action@master
with:
level: error
fail_on_error: true
workdir: './src'
checkstyle_config: './checkstyle.xml'
workdir: "./src"
checkstyle_config: "./checkstyle.xml"
github_token: ${{ secrets.API_TOKEN }}
24 changes: 12 additions & 12 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
name: 'Discover vulnerabilities with CodeQL'
name: "Discover vulnerabilities with CodeQL"
on:
push:
branches: [ 'master' ]
branches: ["master"]
paths:
- '**/*.java'
- '**/*.js'
- "**/*.java"
- "**/*.js"
pull_request:
branches: [ 'master' ]
branches: ["master"]
paths:
- '**/*.java'
- '**/*.js'
- "**/*.java"
- "**/*.js"
schedule:
- cron: '0 0 * * 1'
- cron: "0 0 * * 1"

jobs:
analyze:
runs-on: 'ubuntu-latest'
runs-on: "ubuntu-latest"
permissions:
actions: read
contents: read
security-events: write
strategy:
fail-fast: false
matrix:
language: [ 'java', 'javascript' ]
language: ["java", "javascript"]
steps:
- name: Setup Maven
uses: s4u/setup-maven-action@v1.13.0
uses: s4u/setup-maven-action@v1.14.0
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
Expand All @@ -36,4 +36,4 @@ jobs:
- name: Perform CodeQL analysis
uses: github/codeql-action/analyze@v3
with:
category: '/language:${{matrix.language}}'
category: "/language:${{matrix.language}}"
6 changes: 3 additions & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Publish image builds to Docker Hub'
name: "Publish image builds to Docker Hub"
on:
push:
tags: [ 'v*' ]
tags: ["v*"]

jobs:
publish:
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
core.setOutput('tag-minor', minor)
core.setOutput('tag-major', major)
- name: Build and push image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
push: true
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: 'Check JavaScript files with ESLint'
name: "Check JavaScript files with ESLint"
on:
pull_request:
paths:
- '**/*.js'
- "**/*.js"

jobs:
eslint:
Expand All @@ -13,9 +13,9 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '18'
cache: 'npm'
cache-dependency-path: 'package-lock.json'
node-version: "18"
cache: "npm"
cache-dependency-path: "package-lock.json"
- name: Install Dependencies
run: npm ci
- name: Run ESLint
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/hadolint.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: 'Check Dockerfiles with hadolint'
name: "Check Dockerfiles with hadolint"
on:
pull_request:
paths:
- '**/Dockerfile'
- "**/Dockerfile"

jobs:
hadolint:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/htmlhint.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: 'Check HTML files with HTMLHint'
name: "Check HTML files with HTMLHint"
on:
pull_request:
paths:
- '**/*.html'
- "**/*.html"

jobs:
htmlhint:
Expand All @@ -13,9 +13,9 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '18'
cache: 'npm'
cache-dependency-path: 'package-lock.json'
node-version: "18"
cache: "npm"
cache-dependency-path: "package-lock.json"
- name: Install Dependencies
run: npm ci
- name: Run HTMLHint
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/markdownlint.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: 'Check Markdown files with markdownlint'
name: "Check Markdown files with markdownlint"
on:
pull_request:
paths:
- '**/*.md'
- "**/*.md"

jobs:
markdownlint:
Expand All @@ -13,9 +13,9 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '18'
cache: 'npm'
cache-dependency-path: 'package-lock.json'
node-version: "18"
cache: "npm"
cache-dependency-path: "package-lock.json"
- name: Install Dependencies
run: npm ci
- name: Run markdownlint
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Create new release'
name: "Create new release"
on:
push:
tags: [ 'v*' ]
tags: ["v*"]

jobs:
release:
Expand Down Expand Up @@ -29,4 +29,4 @@ jobs:
- name: Create release
uses: ncipollo/release-action@v1
with:
body: '**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.tag-previous.outputs.result }}...${{ steps.tag-current.outputs.result }}'
body: "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.tag-previous.outputs.result }}...${{ steps.tag-current.outputs.result }}"
12 changes: 6 additions & 6 deletions .github/workflows/reminders.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
name: 'Remind maintainers to update the database dumps'
name: "Remind maintainers to update the database dumps"
on:
schedule:
- cron: '0 9 1 * *'
- cron: "0 9 1 * *"

jobs:
remind:
runs-on: 'ubuntu-latest'
runs-on: "ubuntu-latest"
permissions:
issues: write
steps:
- name: Create Reminder
uses: imjohnbo/issue-bot@v3
with:
assignees: 'dabico'
labels: 'dumps'
assignees: "dabico"
labels: "dumps"
title: Update database dump
body: |-
### Checklist
Expand All @@ -23,7 +23,7 @@ jobs:
- [ ] Update [README](https://github.com/seart-group/ghs/blob/master/README.md) links
- [ ] Update [custom database image](https://github.com/seart-group/ghs/blob/master/docker/database/Dockerfile)
- [ ] Remove oldest dump from [Dropbox](https://www.dropbox.com/login)
[Previous Issue](https://github.com/seart-group/ghs/issues/{{ previousIssueNumber }})
pinned: false
close-previous: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reviewer.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Automatically review Dependabot updates'
name: "Automatically review Dependabot updates"
on:
pull_request_target:
types: [ 'opened' ]
types: ["opened"]
env:
PR_URL: ${{ github.event.pull_request.html_url }}
GITHUB_TOKEN: ${{ secrets.API_TOKEN }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Close stale issues'
name: "Close stale issues"
on:
schedule:
- cron: '0 0 * * *'
- cron: "0 0 * * *"

jobs:
stale:
Expand All @@ -14,11 +14,11 @@ jobs:
uses: actions/stale@v9
with:
repo-token: ${{ secrets.API_TOKEN }}
stale-issue-label: 'stale'
exempt-issue-labels: 'bug'
stale-issue-label: "stale"
exempt-issue-labels: "bug"
days-before-issue-stale: 30
days-before-issue-close: 14
days-before-pr-stale: -1
days-before-pr-close: -1
stale-issue-message: 'This issue is stale because it has been open for 30 days with no activity.'
close-issue-message: 'This issue was closed because it has been inactive for 14 days since being marked as stale.'
stale-issue-message: "This issue is stale because it has been open for 30 days with no activity."
close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
10 changes: 5 additions & 5 deletions .github/workflows/stylelint.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: 'Check CSS files with Stylelint'
name: "Check CSS files with Stylelint"
on:
pull_request:
paths:
- '**/*.css'
- "**/*.css"

jobs:
stylelint:
Expand All @@ -13,9 +13,9 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '18'
cache: 'npm'
cache-dependency-path: 'package-lock.json'
node-version: "18"
cache: "npm"
cache-dependency-path: "package-lock.json"
- name: Install Dependencies
run: npm ci
- name: Run Stylelint
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/tagger.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Prepare and create new tag'
name: "Prepare and create new tag"
on:
workflow_dispatch:
inputs:
Expand All @@ -16,16 +16,16 @@ jobs:
- name: Validate inputs
run: echo "${{ github.event.inputs.version }}" | grep -E "^[0-9]+\.[0-9]+\.[0-9]+$"
- name: Setup Maven
uses: s4u/setup-maven-action@v1.13.0
uses: s4u/setup-maven-action@v1.14.0
with:
checkout-token: ${{ secrets.API_TOKEN }}
checkout-persist-credentials: true
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '18'
cache: 'npm'
cache-dependency-path: 'package-lock.json'
node-version: "18"
cache: "npm"
cache-dependency-path: "package-lock.json"
- name: Import GPG key
uses: crazy-max/ghaction-import-gpg@v6
with:
Expand All @@ -41,9 +41,9 @@ jobs:
uses: EndBug/add-and-commit@v9
with:
add: '[ "pom.xml", "package.json", "package-lock.json" ]'
commit: '-S'
author_name: 'seart-bot'
author_email: '[email protected]'
message: 'New release: ${{ github.event.inputs.version }}'
tag: 'v${{ github.event.inputs.version }} --force'
tag_push: '--force'
commit: "-S"
author_name: "seart-bot"
author_email: "[email protected]"
message: "New release: ${{ github.event.inputs.version }}"
tag: "v${{ github.event.inputs.version }} --force"
tag_push: "--force"
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
npm run format
5 changes: 1 addition & 4 deletions .markdownlint.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
"default": true,
"MD013": {
"line_length": 120,
"tables": false
}
"extends": "markdownlint/style/prettier"
}
Loading

0 comments on commit b4c6468

Please sign in to comment.