Skip to content
Snippets Groups Projects
Commit af740589 authored by Tobias Mieves's avatar Tobias Mieves :sparkles:
Browse files

merge origin/main into develop

parents 27e5584a 64bf3e0c
Branches
Tags v2.2.5-develop.1
No related merge requests found
stages: include:
- install - project: tobiasff3200/ci-cd
- test file: .gitlab-ci.yml
- docker inputs:
- release npm-root: "./"
docker:build:
stage: docker
image: docker:24
services:
- docker:dind
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
- docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG -t $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:develop .
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
- if [[ $CI_COMMIT_TAG == *"develop"* ]]; then
docker push $CI_REGISTRY_IMAGE:develop;
else
docker push $CI_REGISTRY_IMAGE:latest;
fi
only:
- tags
release: npm:build:
image: node:20-buster-slim rules:
stage: release - when: never
before_script:
- apt-get update && apt-get install -y --no-install-recommends git-core ca-certificates
- npm install -g semantic-release @semantic-release/gitlab @semantic-release/git @semantic-release/changelog @semantic-release/release-notes-generator
script:
- semantic-release
only:
- main
- develop
include: npm:test:
- template: Dependency-Scanning.gitlab-ci.yml rules:
- template: Security/License-Scanning.gitlab-ci.yml - when: never
- template: Security/SAST.gitlab-ci.yml
- template: Secret-Detection.gitlab-ci.yml
- template: Code-Quality.gitlab-ci.yml
version: 25
jobs:
- name: Git Sync Push
steps:
- !PushRepository
name: Push to gitlab.fachschaften.org
remoteUrl: https://gitlab.fachschaften.org/tobiasff3200/wishlist.git
userName: Tobias
passwordSecret: GitLab.Fachschaften.org_Sync_Token
force: false
condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
triggers:
- !BranchUpdateTrigger { }
- !TagCreateTrigger { }
retryCondition: never
maxRetries: 3
retryDelay: 30
timeout: 3600
- name: Git Sync Pull
steps:
- !PullRepository
name: Pull from gitlab.fachschaften.org
remoteUrl: https://gitlab.fachschaften.org/tobiasff3200/wishlist.git
syncToChildProject: false
userName: Tobias
passwordSecret: GitLab.Fachschaften.org_Sync_Token
refs: refs/heads/* refs/tags/*
withLfs: true
force: false
condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
triggers:
- !ScheduleTrigger
cronExpression: 5 4 * * * ?
retryCondition: never
maxRetries: 3
retryDelay: 30
timeout: 3600
FROM registry.gitlab.fachschaften.org/tobiasff3200/django-core:v2.0.2 as core FROM registry.gitlab.fachschaften.org/tobiasff3200/django-core:v2.0.3 as core
WORKDIR /app WORKDIR /app
COPY . /app/wishlist COPY . /app/wishlist
RUN pip install --no-cache-dir -r wishlist/requirements.txt RUN pip install --no-cache-dir -r wishlist/requirements.txt
...@@ -8,7 +8,7 @@ RUN sed -i 's/{{app_to_install}}/wishlist/g' core/settings.py ...@@ -8,7 +8,7 @@ RUN sed -i 's/{{app_to_install}}/wishlist/g' core/settings.py
RUN sed -i 's/{{app_to_install}}/wishlist/g' core/urls.py RUN sed -i 's/{{app_to_install}}/wishlist/g' core/urls.py
FROM node:20 AS node FROM node:21 AS node
WORKDIR /app/wishlist WORKDIR /app/wishlist
COPY --from=core /app /app COPY --from=core /app /app
RUN npm ci RUN npm ci
......
{ {
"dependencies": { "lockfileVersion": 3,
"camelcase-css": {
"integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
"resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
"version": "2.0.1"
},
"css-selector-tokenizer": {
"integrity": "sha512-Jd6Ig3/pe62/qe5SBPTN8h8LeUg/pT4lLgtavPf7updwwHpvFzxvOQBHYj2LZDMjUnBzgvIUSjRcf6oT5HzHFg==",
"requires": {
"cssesc": "^3.0.0",
"fastparse": "^1.1.2"
},
"resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.8.0.tgz",
"version": "0.8.0"
},
"cssesc": {
"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
"version": "3.0.0"
},
"culori": {
"integrity": "sha512-pHJg+jbuFsCjz9iclQBqyL3B2HLCBF71BwVNujUYEvCeQMvV97R59MNK3R2+jgJ3a1fcZgI9B3vYgz8lzr/BFQ==",
"resolved": "https://registry.npmjs.org/culori/-/culori-3.3.0.tgz",
"version": "3.3.0"
},
"daisyui": {
"integrity": "sha512-Wqk1f3rQbiDSMfzC/ZufQQi139dY4mCMZJ/hmYIIGpCi0MFndU0wJ575tEGzi2YrCZOagsWhbOeWE7DD/B5pVw==",
"requires": {
"css-selector-tokenizer": "^0.8",
"culori": "^3",
"picocolors": "^1",
"postcss-js": "^4"
},
"resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.4.9.tgz",
"version": "4.4.9"
},
"fastparse": {
"integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
"resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
"version": "1.1.2"
},
"nanoid": {
"integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
"peer": true,
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
"version": "3.3.7"
},
"picocolors": {
"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
"version": "1.0.0"
},
"postcss": {
"integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
"peer": true,
"requires": {
"nanoid": "^3.3.6",
"picocolors": "^1.0.0",
"source-map-js": "^1.0.2"
},
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
"version": "8.4.31"
},
"postcss-js": {
"integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
"requires": {
"camelcase-css": "^2.0.1"
},
"resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
"version": "4.0.1"
},
"source-map-js": {
"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
"peer": true,
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
"version": "1.0.2"
}
},
"lockfileVersion": 2,
"name": "wishlist", "name": "wishlist",
"packages": { "packages": {
"": { "": {
"dependencies": { "dependencies": {
"daisyui": "^4.4.9" "daisyui": "^4.4.19"
} }
}, },
"node_modules/camelcase-css": { "node_modules/camelcase-css": {
...@@ -135,9 +57,9 @@ ...@@ -135,9 +57,9 @@
"type": "opencollective", "type": "opencollective",
"url": "https://opencollective.com/daisyui" "url": "https://opencollective.com/daisyui"
}, },
"integrity": "sha512-Wqk1f3rQbiDSMfzC/ZufQQi139dY4mCMZJ/hmYIIGpCi0MFndU0wJ575tEGzi2YrCZOagsWhbOeWE7DD/B5pVw==", "integrity": "sha512-IjOLWwnndD4N7Ut5CDxbUsaVtbqXPeVHM92IcgxGFxpuOd3CCKW/PAXZH6JoBTHFRaN57vB9XqEhdWm5yC+bPA==",
"resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.4.9.tgz", "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.4.19.tgz",
"version": "4.4.9" "version": "4.4.19"
}, },
"node_modules/fastparse": { "node_modules/fastparse": {
"integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==", "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
......
{ {
"dependencies": { "dependencies": {
"daisyui": "^4.4.9" "daisyui": "^4.4.19"
}, },
"scripts": { "scripts": {
"tailwind": "npx tailwindcss -i static/wishlist/css/main.css -o ../static/core/css/output.css", "tailwind": "npx tailwindcss -i static/wishlist/css/main.css -o ../static/core/css/output.css",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment