Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to node 20 and use a stable debian build #197

Merged
merged 5 commits into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/job--build-and-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20

- name: Install development dependencies
run: yarn install --ignore-scripts
Expand All @@ -46,7 +46,7 @@ jobs:
- name : Install QEMU emulator
if: ${{ inputs.QEMU_ARCH != 'none' }}
run: |
wget -q https://github.com/multiarch/qemu-user-static/releases/download/v3.0.0/x86_64_qemu-${{ inputs.QEMU_ARCH }}-static.tar.gz
wget -q https://github.com/multiarch/qemu-user-static/releases/download/v7.2.0-1/x86_64_qemu-${{ inputs.QEMU_ARCH }}-static.tar.gz
tar xfvz x86_64_qemu-${{ inputs.QEMU_ARCH }}-static.tar.gz
docker run --rm --privileged multiarch/qemu-user-static:register --reset

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/job--test-and-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20

- name: Install development dependencies
run: yarn install --ignore-scripts
Expand Down
4 changes: 4 additions & 0 deletions Taskfile
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ function task:start { ## Start the project locally
docker:start
}

function task:build { ## (re)build the docker containers
docker:build
}

function task:stop { ## Stop the project locally
docker:stop
}
Expand Down
2 changes: 1 addition & 1 deletion backend/parser/github/job.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class GitHubJobParser {
}

isStepNotBlacklisted(stepId: string): boolean {
const blacklist = ['set-up-job', 'complete-job', 'checkout-branch', /^post-/];
const blacklist = ['set-up-job', 'complete-job', 'checkout-branch', /^post-/, /^run-actions-/];

for (let bannedItem of blacklist) {
if (bannedItem instanceof RegExp && bannedItem.test(stepId)) {
Expand Down
4 changes: 2 additions & 2 deletions docker/module-client/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG QEMU_BINARY=notset
ARG BASE_IMAGE=node:16-slim
ARG BASE_IMAGE=node:20-slim

# ==================================
# Base stage
Expand Down Expand Up @@ -27,7 +27,7 @@ FROM base as production-qemu

COPY ./${QEMU_BINARY}* /usr/bin/

RUN echo "deb http://deb.debian.org/debian unstable main contrib non-free" >> /etc/apt/sources.list \
RUN echo "deb http://deb.debian.org/debian stable main contrib non-free" >> /etc/apt/sources.list \
&& apt-get --yes update \
&& apt-get --yes install dumb-init

Expand Down
4 changes: 2 additions & 2 deletions docker/server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG QEMU_BINARY=notset
ARG BASE_IMAGE=node:16-slim
ARG BASE_IMAGE=node:20-slim

# ==================================
# Base stage
Expand Down Expand Up @@ -35,7 +35,7 @@ FROM base as production-qemu

COPY ./${QEMU_BINARY}* /usr/bin/

RUN echo "deb http://deb.debian.org/debian unstable main contrib non-free" >> /etc/apt/sources.list \
RUN echo "deb http://deb.debian.org/debian stable main contrib non-free" >> /etc/apt/sources.list \
&& apt-get --yes update \
&& apt-get --yes install dumb-init

Expand Down
3 changes: 2 additions & 1 deletion frontend/store/cache/fetch.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import axios from 'axios';

import store, { RootState } from '/frontend/store';
import store from '/frontend/store';
import { RootState } from '/frontend/store/store';

import { setChangelog, setContributors, setVersion } from './actions';

Expand Down
2 changes: 1 addition & 1 deletion frontend/store/cache/selectors.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RootState } from 'frontend/store';
import { RootState } from '/frontend/store/store';

import { Change, Contributor, Version } from '/types/cimonitor';

Expand Down
2 changes: 1 addition & 1 deletion frontend/store/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default, RootState } from './store';
export { default } from './store';
2 changes: 1 addition & 1 deletion frontend/store/settings/selectors.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RootState } from 'frontend/store';
import { RootState } from '/frontend/store/store';

export const isSettingsPanelOpen = (state: RootState): boolean => state.setting.open;

Expand Down
2 changes: 1 addition & 1 deletion frontend/store/status/selectors.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RootState } from '/frontend/store';
import { RootState } from '/frontend/store/store';

import Status, { State } from '/types/status';

Expand Down
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cimonitor",
"version": "4.9.0",
"version": "4.10.0",
"description": "Monitors all your projects CI automatically",
"repository": "[email protected]:FuturePortal/CIMonitor.git",
"license": "MIT",
Expand All @@ -27,21 +27,21 @@
},
"dependencies": {
"axios": "^0.26.1",
"body-parser": "^1.19.2",
"dotenv": "^16.0.0",
"express": "^4.17.3",
"body-parser": "^1.20.2",
"dotenv": "^16.3.1",
"express": "^4.18.2",
"firebase-admin": "^10.0.2",
"socket.io": "^4.4.1",
"socket.io-client": "^4.4.1"
"socket.io": "^4.7.2",
"socket.io-client": "^4.7.2"
},
"devDependencies": {
"@futureportal/parcel-transformer-package-version": "^1.0.0",
"@parcel/packager-raw-url": "2.3.2",
"@parcel/transformer-svg-react": "^2.3.2",
"@parcel/transformer-typescript-tsc": "^2.3.2",
"@parcel/transformer-webmanifest": "2.3.2",
"@types/express": "^4.17.13",
"@types/node": "^16",
"@parcel/packager-raw-url": "2.10.0",
"@parcel/transformer-svg-react": "^2.10.0",
"@parcel/transformer-typescript-tsc": "^2.10.0",
"@parcel/transformer-webmanifest": "2.10.0",
"@types/express": "^4.17.19",
"@types/node": "^20.8.5",
"@types/react": "^17.0.39",
"@types/react-dom": "^17.0.11",
"@types/react-redux": "^7.1.23",
Expand All @@ -62,15 +62,15 @@
"husky": "^7.0.0",
"lint-staged": "^12.3.4",
"nodemon": "^2.0.15",
"parcel": "^2.3.2",
"parcel": "^2.10.0",
"prettier": "^2.5.1",
"process": "^0.11.10",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-redux": "^7.2.6",
"showdown": "^2.1.0",
"styled-components": "^5.3.3",
"ts-node": "^10.7.0",
"ts-node": "^10.9.1",
"typescript": "^4.5.5"
}
}
Loading