Skip to content

Commit

Permalink
feat: dependency updates, workflow changes
Browse files Browse the repository at this point in the history
  • Loading branch information
lotyp committed Mar 18, 2023
1 parent 3b9473c commit 401ac7c
Show file tree
Hide file tree
Showing 12 changed files with 48 additions and 39 deletions.
11 changes: 11 additions & 0 deletions .changeset/breezy-suits-explain.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
'@wayofdev/eslint-config-bases': patch
'@wayofdev/commitlint-config': patch
'@wayofdev/secretlint-config': patch
'@wayofdev/stylelint-config': patch
'@wayofdev/htmlhint-config': patch
'@wayofdev/tsconfig-config': patch
'@wayofdev/postcss-config': patch
---

fix: dependency updates, workflow changes
14 changes: 1 addition & 13 deletions .github/workflows/ci-packages.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---

on: # yamllint disable-line rule:truthy
merge_group:
push:
branches:
- master
Expand All @@ -24,18 +24,6 @@ on: # yamllint disable-line rule:truthy
- 'pnpm*'
- '.github/**'

merge_group:
types:
- opened
- synchronize
- reopened
# Only consider those paths to trigger the action
paths:
- 'packages/**'
- 'package.json'
- 'pnpm*'
- '.github/**'

name: 🔍 Continuous integration for packages

jobs:
Expand Down
18 changes: 15 additions & 3 deletions .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---

on: # yamllint disable-line rule:truthy
on: # yamllint disable-line rule:truthy
pull_request:

name: 🐞 Differential shell-check
Expand All @@ -11,16 +10,29 @@ permissions:
jobs:
shellcheck:
runs-on: ubuntu-latest
permissions:
# required for all workflows
security-events: write
# only required for workflows in private repositories
actions: read
contents: read

steps:
- name: 📦 Check out the codebase
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: 🐞 Differential shell-check
id: shellcheck
uses: redhat-plumbers-in-action/differential-shellcheck@v4
with:
severity: warning
token: ${{ secrets.GITHUB_TOKEN }}

...
- if: ${{ always() }}
name: 📤 Upload artifact with shell-check defects in SARIF format
uses: actions/upload-artifact@v3
with:
name: Differential shell-check SARIF
path: ${{ steps.shellcheck.outputs.sarif }}
10 changes: 9 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ DOCKER_COMPOSE ?= docker-compose
# Support image with all needed binaries, like envsubst, mkcert, wait4x
SUPPORT_IMAGE ?= wayofdev/build-deps:alpine-latest

BUILDER_PARAMS ?= docker run --rm -i -v $(shell pwd):/home/wod
BUILDER_PARAMS ?= docker run \
--rm \
-i \
-v $(PWD):/app \
--workdir /app

BUILDER ?= $(BUILDER_PARAMS) $(SUPPORT_IMAGE)
NPM_BIN ?= pnpm
Expand Down Expand Up @@ -150,6 +154,10 @@ lint-actions: ## Lint github actions using actionlint
$(BUILDER) actionlint -color
.PHONY: lint-actions

lint-types: ## Run typecheck
$(NPM_BIN) lint:types
.PHONY: lint-types

test: ## Run unit tests
$(NPM_BIN) test
.PHONY: test
Expand Down
2 changes: 0 additions & 2 deletions packages/commitlint-config/lint-staged.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// @ts-check

/**
* This files overrides the base lint-staged.config.js present in the root directory.
* It allows to run eslint based the package specific requirements.
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config-bases/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
"@wayofdev/lint-staged-config": "workspace:*",
"eslint": "8.36.0",
"graphql": "16.6.0",
"prettier": "2.8.3 || >= 3.0.0-alpha.4",
"prettier": "2.8.4",
"react": "18.2.0",
"react-dom": "18.2.0",
"tailwindcss": "3.2.7",
Expand Down
3 changes: 1 addition & 2 deletions packages/htmlhint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@
"scripts": {
"clean": "rimraf ./dist ./coverage ./tsconfig.tsbuildinfo",
"lint": "eslint --ext .json --cache --cache-location ../../.cache/eslint/htmlhint-config.eslintcache",
"lint:fix": "eslint --ext .json --fix --cache --cache-location ../../.cache/eslint/htmlhint-config.eslintcache",
"lint:types": "tsc --project tsconfig.json --noEmit"
"lint:fix": "eslint --ext .json --fix --cache --cache-location ../../.cache/eslint/htmlhint-config.eslintcache"
},
"devDependencies": {
"@wayofdev/lint-staged-config": "workspace:*",
Expand Down
3 changes: 1 addition & 2 deletions packages/secretlint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
"scripts": {
"clean": "rimraf ./dist ./coverage ./tsconfig.tsbuildinfo",
"lint": "eslint --ext .js --cache --cache-location ../../.cache/eslint/secretlint-config.eslintcache",
"lint:fix": "eslint --ext .js --fix --cache --cache-location ../../.cache/eslint/secretlint-config.eslintcache",
"lint:types": "tsc --project tsconfig.json --noEmit"
"lint:fix": "eslint --ext .js --fix --cache --cache-location ../../.cache/eslint/secretlint-config.eslintcache"
},
"dependencies": {
"@secretlint/secretlint-rule-preset-recommend": "6.2.3"
Expand Down
2 changes: 0 additions & 2 deletions packages/stylelint-config/lint-staged.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// @ts-check

/**
* This files overrides the base lint-staged.config.js present in the root directory.
* It allows to run eslint based the package specific requirements.
Expand Down
2 changes: 1 addition & 1 deletion packages/tsconfig-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"lint:fix": "eslint --ext .ts,.tsx,.js,.jsx,.mjs,.cjs,.mts,.cts --fix --cache --cache-location ../../.cache/eslint/tsconfig-config.eslintcache"
},
"peerDependencies": {
"typescript": ">= 4"
"typescript": "^4.9 || ^5"
},
"publishConfig": {
"access": "public"
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 3 additions & 7 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base"
],
"extends": ["config:base"],
"prHourlyLimit": 0,
"automerge": true,
"platformAutomerge": true,
"lockFileMaintenance": {
Expand All @@ -14,10 +13,7 @@
"packageRules": [
{
"description": "Automerge non-major updates",
"matchUpdateTypes": [
"minor",
"patch"
],
"matchUpdateTypes": ["minor", "patch"],
"automerge": true,
"platformAutomerge": true
}
Expand Down

0 comments on commit 401ac7c

Please sign in to comment.