Skip to content

Commit

Permalink
Merge pull request #1196 from gettakaro/main-promotion
Browse files Browse the repository at this point in the history
  • Loading branch information
niekcandaele authored Sep 7, 2024
2 parents 39c5ed4 + 850bea7 commit f7e253b
Show file tree
Hide file tree
Showing 114 changed files with 32,658 additions and 27,746 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 18.18
node-version: 20
cache: 'npm'

- run: ./scripts/dev-init.sh
Expand All @@ -42,6 +42,7 @@ jobs:
npm -w packages/lib-modules run build
npm -w packages/test run build
npm -w packages/web-main run build
npm -w packages/web-docs run build
- name: Extract branch name
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codestyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 18.18
node-version: 20
cache: 'npm'

- run: ./scripts/dev-init.sh
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:
- name: Setup Pages
uses: actions/configure-pages@v5

- name: Use Node.js 18.18
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 18.18
node-version: 20

- run: ./scripts/dev-init.sh

Expand All @@ -44,7 +44,7 @@ jobs:
mv reports/api-docs packages/web-docs/build/api-docs
- name: Upload artifact
uses: actions/upload-pages-artifact@v4
uses: actions/upload-pages-artifact@v3
with:
path: "./packages/web-docs/build"

Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/dev-to-main-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,22 @@ jobs:
body: |
This PR merges the development branch into the main branch.
It is created automatically by the Takaro CI bot.
updateDevelopment:
runs-on: ubuntu-latest
steps:
- name: Generate token
id: generate_token
uses: tibdex/github-app-token@v2
with:
app_id: ${{ secrets.TAKARO_CI_APP_ID }}
private_key: ${{ secrets.TAKARO_CI_APP_PRIV_KEY }}
- uses: actions/checkout@v4
with:
ref: development
token: ${{ steps.generate_token.outputs.token }}
- name: Update dev
run: |
git fetch origin main:main
git rebase main
git push --force-with-lease origin development
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
runs-on: ubuntu-24.04
strategy:
matrix:
node-version: [18.18]
node-version: [20]

steps:
- name: Generate token
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-libs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 18.18
node-version: 20
cache: 'npm'
registry-url: 'https://registry.npmjs.org'

Expand All @@ -45,4 +45,4 @@ jobs:

- run: npm -w packages/${{ matrix.package.name }} publish --access public
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
steps:
- name: Generate token
id: generate_token
uses: tibdex/github-app-token@v1
uses: tibdex/github-app-token@v2
with:
app_id: ${{ secrets.TAKARO_CI_APP_ID }}
private_key: ${{ secrets.TAKARO_CI_APP_PRIV_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.20.4
20.17.0
3 changes: 3 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ const config: StorybookConfig = {

// related to storybook out of memory: https://github.com/storybookjs/storybook/issues/12348
return mergeConfig(config, {
core: {
disableTelemetry: true,
},
build: {
sourcemap: buildSourceMap,
},
Expand Down
1 change: 0 additions & 1 deletion .storybook/preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { GlobalStyle } from '../packages/lib-components/src/styled/GlobalStyle';
import { StepperProvider } from '../packages/lib-components/src/components/navigation/Steppers/context';
import { SnackbarProvider } from '../packages/lib-components/src/helpers/getSnackbarProvider';
import 'simplebar-react/dist/simplebar.min.css';
import 'rc-slider/assets/index.css';
import { Preview } from '@storybook/react';

const preview: Preview = {
Expand Down
4 changes: 2 additions & 2 deletions containers/generic-app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18.20.4-alpine AS builder
FROM node:20.17.0-alpine AS builder

ARG PACKAGE
ENV NODE_ENV=development
Expand All @@ -21,7 +21,7 @@ RUN npm run -w packages/${PACKAGE} build
# So with this command we prebuild library packages and make them available for later
RUN find packages -type d -name 'lib-*' -exec sh -c 'npm run -w {} build && mkdir -p libraries/{}/ && cp -r {}/dist libraries/{}/ && cp -r {}/package*.json libraries/{}/' \;

FROM node:18.20-alpine AS runner
FROM node:20.17-alpine AS runner

# Version 9+ is required to run npm scripts as root
RUN npm install -g npm@9
Expand Down
2 changes: 1 addition & 1 deletion containers/generic-web/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18.20.4-alpine AS builder
FROM node:20.17.0-alpine AS builder

ARG PACKAGE
ENV NODE_ENV=development
Expand Down
2 changes: 1 addition & 1 deletion containers/takaro/dev.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18.20.4-bullseye
FROM node:20.17.0-bullseye

ENV NODE_ENV=development

Expand Down
2 changes: 1 addition & 1 deletion deploy/compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ services:
POSTGRES_DB: kratos

prometheus:
image: prom/prometheus:v2.54.0
image: prom/prometheus:v2.54.1
container_name: prometheus
command:
- '--config.file=/etc/prometheus/prometheus.yml'
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ services:
driver: none

prometheus:
image: prom/prometheus:v2.54.0
image: prom/prometheus:v2.54.1
container_name: prometheus
command:
- '--config.file=/etc/prometheus/prometheus.yml'
Expand All @@ -184,7 +184,7 @@ services:
- "9091:9091"

grafana:
image: grafana/grafana:10.4.7
image: grafana/grafana:10.4.8
environment:
- GF_AUTH_ANONYMOUS_ENABLED=true
- GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
Expand Down
29 changes: 2 additions & 27 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
import url from 'node:url';
import eslint from '@eslint/js';
import tseslint from 'typescript-eslint';
import deprecationPlugin from 'eslint-plugin-deprecation';
import reactPlugin from 'eslint-plugin-react';
import reactHooksPlugin from 'eslint-plugin-react-hooks';
import importPlugin from 'eslint-plugin-import';
import storybookPlugin from 'eslint-plugin-storybook';

import { FlatCompat } from '@eslint/eslintrc';
Expand All @@ -18,10 +15,7 @@ export default tseslint.config(
{
plugins: {
'@typescript-eslint': tseslint.plugin,
'deprecation': deprecationPlugin,
'import': importPlugin,
'react': reactPlugin,
'react-hooks': reactHooksPlugin,
},
},

Expand All @@ -42,7 +36,8 @@ export default tseslint.config(
'**/*.d.ts',
'**/jest.config.js',
'**/mocharc.js',
'**/.storybook/**'
'**/.storybook/**',
'**/.docusaurus/**'
],
},

Expand All @@ -68,7 +63,6 @@ export default tseslint.config(
},
},
rules: {
'deprecation/deprecation': 'error',

'no-console': 'off',
quotes: ['error', 'single'],
Expand Down Expand Up @@ -115,20 +109,6 @@ export default tseslint.config(
allow: ['arrowFunctions'],
},
],

// eslint-plugin-import
'import/consistent-type-specifier-style': 'error',
'import/first': 'error',
'import/newline-after-import': 'error',
'import/no-absolute-path': 'error',
'import/no-amd': 'error',
'import/no-default-export': 'error',
'import/no-duplicates': 'error',
'import/no-mutable-exports': 'error',
'import/no-named-default': 'error',
'import/no-named-export': 'off',
'import/no-self-import': 'error',
'import/prefer-default-export': 'off',
},
},
{
Expand All @@ -150,9 +130,6 @@ export default tseslint.config(
extends: [
...compat.config(storybookPlugin.configs.recommended)
],
rules: {
'react-hooks/rules-of-hooks': 'off'
}
},

// config for tests
Expand All @@ -173,15 +150,13 @@ export default tseslint.config(
files: ['packages/lib-components/**/*.{ts,tsx,mts,cts,js,jsx}', 'packages/web-main/**/*.{ts,tsx,mts,cts,js,jsx}'],
extends: [
...compat.config(reactPlugin.configs.recommended),
...compat.config(reactHooksPlugin.configs.recommended),
],
rules: {
'import/no-default-export': 'off',
'react/react-in-jsx-scope': 'off',
'react/no-unescaped-entities': 'off',
'react/prop-types': 'off',
'react/exhaustive-deps': 'off',
'react-hooks/exhaustive-deps': 'off',
},
settings: {
react: {
Expand Down
Loading

0 comments on commit f7e253b

Please sign in to comment.