Skip to content

Commit

Permalink
Merge branch 'technologiestiftung-feat/reduce-noise'
Browse files Browse the repository at this point in the history
  • Loading branch information
ff6347 committed Dec 11, 2023
2 parents aa80982 + 5f275b3 commit 76404bf
Show file tree
Hide file tree
Showing 11 changed files with 12,058 additions and 22,848 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @fabianmoronzirfas
* @ff6347
4 changes: 2 additions & 2 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["local>inpyjamas/renovate-config#next"]
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["local>technologiestiftung/renovate-config"]
}
25 changes: 8 additions & 17 deletions .github/workflows/test-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Node.js CI
permissions:
contents: write
on:
push:
branches: [master, staging]
branches: [master, next]
tags:
- "v*"
pull_request:
branches: [master, staging]
branches: [master, next]
workflow_dispatch: {}

jobs:
build:
Expand All @@ -20,7 +23,7 @@ jobs:
node-version: [18.x, 20.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
- name: Checkout technologiestiftung/stadtpuls-test-utils
- name: Checkout source
uses: actions/checkout@v4

- name: Use Node.js ${{ matrix.node-version }}
Expand All @@ -42,27 +45,15 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
persist-credentials: false
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: "lts/*"
node-version-file: ".nvmrc"
- name: Install dependencies
run: npm ci
- name: Release
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
NPM_TOKEN: ${{secrets.NPM_TOKEN}}
run: npx semantic-release
# publish-gpr:
# needs: release
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v3
# - uses: actions/setup-node@v2
# with:
# node-version: 12
# registry-url: https://npm.pkg.github.com/
# - run: npm ci
# - run: npm publish
# env:
# NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,6 @@ dist

# TernJS port file
.tern-port
.github/.DS_Store
.gitignore
.DS_Store
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20
v20.10.0
50 changes: 30 additions & 20 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,32 @@
{
"workbench.colorCustomizations": {
"activityBar.activeBackground": "#0499c8",
"activityBar.activeBorder": "#fec1ef",
"activityBar.background": "#0499c8",
"activityBar.foreground": "#e7e7e7",
"activityBar.inactiveForeground": "#e7e7e799",
"activityBarBadge.background": "#fec1ef",
"activityBarBadge.foreground": "#15202b",
"statusBar.background": "#037396",
"statusBar.foreground": "#e7e7e7",
"statusBarItem.hoverBackground": "#0499c8",
"titleBar.activeBackground": "#037396",
"titleBar.activeForeground": "#e7e7e7",
"titleBar.inactiveBackground": "#03739699",
"titleBar.inactiveForeground": "#e7e7e799",
"sash.hoverBorder": "#0499c8",
"statusBarItem.remoteBackground": "#037396",
"statusBarItem.remoteForeground": "#e7e7e7"
},
"peacock.color": "#037396"
"workbench.colorCustomizations": {
"activityBar.activeBackground": "#0499c8",
"activityBar.activeBorder": "#fec1ef",
"activityBar.background": "#0499c8",
"activityBar.foreground": "#e7e7e7",
"activityBar.inactiveForeground": "#e7e7e799",
"activityBarBadge.background": "#fec1ef",
"activityBarBadge.foreground": "#15202b",
"statusBar.background": "#037396",
"statusBar.foreground": "#e7e7e7",
"statusBarItem.hoverBackground": "#0499c8",
"titleBar.activeBackground": "#037396",
"titleBar.activeForeground": "#e7e7e7",
"titleBar.inactiveBackground": "#03739699",
"titleBar.inactiveForeground": "#e7e7e799",
"sash.hoverBorder": "#0499c8",
"statusBarItem.remoteBackground": "#037396",
"statusBarItem.remoteForeground": "#e7e7e7",
"commandCenter.border": "#e7e7e799",
"editorGroup.border": "#0499c8",
"panel.border": "#0499c8",
"sideBar.border": "#0499c8",
"statusBar.border": "#037396",
"statusBar.debuggingBackground": "#962603",
"statusBar.debuggingBorder": "#962603",
"statusBar.debuggingForeground": "#e7e7e7",
"tab.activeBorder": "#0499c8",
"titleBar.border": "#037396"
},
"peacock.color": "#037396"
}
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
## [1.0.1](https://github.com/inpyjamas/renovate-config/compare/v1.0.0...v1.0.1) (2022-04-05)


### Bug Fixes

* **npm config:** Adds config in package.json ([f4fe41d](https://github.com/inpyjamas/renovate-config/commit/f4fe41da1ebcbf334dfa10277a98aff90f38ae85))
- **npm config:** Adds config in package.json ([f4fe41d](https://github.com/inpyjamas/renovate-config/commit/f4fe41da1ebcbf334dfa10277a98aff90f38ae85))
86 changes: 49 additions & 37 deletions default.json
Original file line number Diff line number Diff line change
@@ -1,39 +1,51 @@
{
"extends": ["config:base", "group:monorepos", ":ignoreModulesAndTests"],
"schedule": ["every 2 weeks on Monday before 7am"],
"timezone": "Europe/Berlin",
"semanticCommits": "enabled",
"lockFileMaintenance": { "enabled": false },
"automergeType": "branch",
"packageRules": [
{
"groupName": "renovate-meta",
"semanticCommitType": "chore",
"semanticCommitScope": "deps",
"matchUpdateTypes": ["lockFileMaintenance", "pin"]
},
{
"groupName": "dependencies-non-major",
"semanticCommitType": "deps",
"automerge": false,
"matchDepTypes": ["dependencies"],
"matchUpdateTypes": ["patch", "minor"]
},
{
"groupName": "devDependencies-major",
"semanticCommitType": "chore",
"semanticCommitScope": "deps",
"automerge": false,
"matchDepTypes": ["devDependencies"],
"matchUpdateTypes": ["major"]
},
{
"groupName": "devDependencies-non-major",
"automerge": true,
"semanticCommitType": "chore",
"semanticCommitScope": "deps",
"matchDepTypes": ["devDependencies"],
"matchUpdateTypes": ["patch", "minor"]
}
]
"extends": ["config:base", "group:monorepos", ":ignoreModulesAndTests"],
"schedule": ["every 2 weeks on Monday before 7am"],
"timezone": "Europe/Berlin",
"semanticCommits": "enabled",
"lockFileMaintenance": { "enabled": false },
"automergeType": "branch",
"packageRules": [
{
"groupName": "dependencies-non-major",
"semanticCommitType": "deps",
"automerge": false,
"matchDepTypes": ["dependencies"],
"matchUpdateTypes": [
"minor",
"patch",
"pin",
"pinDigest",
"digest",
"lockFileMaintenance",
"rollback",
"bump"
]
},
{
"groupName": "devDependencies-major",
"semanticCommitType": "chore",
"semanticCommitScope": "deps",
"automerge": false,
"matchDepTypes": ["devDependencies"],
"matchUpdateTypes": ["major"]
},
{
"groupName": "devDependencies-non-major",
"automerge": true,
"semanticCommitType": "chore",
"semanticCommitScope": "deps",
"matchDepTypes": ["devDependencies"],
"matchUpdateTypes": [
"minor",
"patch",
"pin",
"pinDigest",
"digest",
"lockFileMaintenance",
"rollback",
"bump"
]
}
]
}
Loading

0 comments on commit 76404bf

Please sign in to comment.