From e6221d573690e22c2a4fa0154046412b857dc332 Mon Sep 17 00:00:00 2001 From: Matthieu CAILLEAUX Date: Mon, 15 Nov 2021 15:51:20 +0100 Subject: [PATCH] chore: update ci usage of artifact --- .gitlab-ci.yml | 49 ++---------------------------------------------- module-beta.json | 30 ----------------------------- module.json | 2 +- 3 files changed, 3 insertions(+), 78 deletions(-) delete mode 100644 module-beta.json diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 128f43a..5dbd006 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: docker-repository-greenskin.cailleaux.com/greenskin/ci-builder-node14:2.0 +image: node:14.15.5-stretch-slim variables: GIT_DEPTH: 0 @@ -6,7 +6,6 @@ variables: stages: - build - - deploy build: stage: build @@ -25,52 +24,8 @@ build: when: on_success paths: - dist/wfrp4e-actor-sheet-print.zip + expire_in: never only: - tags - master -build_beta: - stage: build - script: - - npm ci - - npm run build - - mkdir -p dist/lang - - mkdir -p dist/styles - - cp lang/* dist/lang/ - - cp styles/* dist/styles/ - - cp module-beta.json dist/module.json - - cd dist - - zip wfrp4e-actor-sheet-print.zip -r *.* elements lang styles -x ".*" - artifacts: - name: wfrp4e-actor-sheet-print - when: on_success - paths: - - dist/wfrp4e-actor-sheet-print.zip - rules: - - if: '$CI_COMMIT_BRANCH =~ /^(dev)\/.*$/' - when: on_success - -deploy: - stage: deploy - script: - - git config --global user.email "$GIT_USER_EMAIL" - - git config --global user.name "$GIT_USER_NAME" - - git add -f dist/wfrp4e-actor-sheet-print.zip - - git commit -m "push artifact on dist branch" - - git remote set-url origin $GIT_SSH_URL - - git push -f origin HEAD:dist - only: - - master - -deploy_beta: - stage: deploy - script: - - git config --global user.email "$GIT_USER_EMAIL" - - git config --global user.name "$GIT_USER_NAME" - - git add -f dist/wfrp4e-actor-sheet-print.zip - - git commit -m "push artifact on dist-beta branch" - - git remote set-url origin $GIT_SSH_URL - - git push -f origin HEAD:dist-beta - rules: - - if: '$CI_COMMIT_BRANCH =~ /^(dev)\/.*$/' - when: on_success diff --git a/module-beta.json b/module-beta.json deleted file mode 100644 index 129b584..0000000 --- a/module-beta.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "wfrp4e-actor-sheet-print-beta", - "title": "[WFRP4] Actor Sheet Print BETA version", - "description": "Functions to print actor sheet", - "version": "1.0.1", - "minimumCoreVersion": "0.8.0", - "compatibleCoreVersion": "0.8.9", - "author": "Skeroujvapluvit", - "systems": ["wfrp4e"], - "dependencies": [], - "esmodules": ["main.js"], - "languages": [ - { - "lang": "en", - "name": "English", - "path": "lang/en.json" - }, - { - "lang": "fr", - "name": "Français", - "path": "lang/fr.json" - } - ], - "styles": ["./styles/main.css"], - "url": "https://github.com/mcailleaux/WFRP4-FoundryVTT-wfrp4e-actor-sheet-print/tree/dist-beta", - "download": "https://github.com/mcailleaux/WFRP4-FoundryVTT-wfrp4e-actor-sheet-print/blob/dist-beta/dist/wfrp4e-actor-sheet-print.zip?raw=true", - "manifest": "https://raw.githubusercontent.com/mcailleaux/WFRP4-FoundryVTT-wfrp4e-actor-sheet-print/dist-beta/module-beta.json", - "readme": "https://raw.githubusercontent.com/mcailleaux/WFRP4-FoundryVTT-wfrp4e-actor-sheet-print/dist-beta/README.md", - "changelog": "https://raw.githubusercontent.com/mcailleaux/WFRP4-FoundryVTT-wfrp4e-actor-sheet-print/dist-beta/CHANGELOG.md" -} diff --git a/module.json b/module.json index e9b67c8..38078b7 100644 --- a/module.json +++ b/module.json @@ -2,7 +2,7 @@ "name": "wfrp4e-actor-sheet-print", "title": "[WFRP4] Actor Sheet Print", "description": "Functions to print actor sheet", - "version": "1.0.1", + "version": "1.0.2", "minimumCoreVersion": "0.8.0", "compatibleCoreVersion": "0.8.9", "author": "Skeroujvapluvit",