Simon/Wallset
Simon/Wallset
1
1
Fork 0
mirror of https://gitlab.com/Thoscellen/Wallset.git synced 2025-05-31 19:04:51 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Merge branch 'main' into 'cicd'

Browse Source
This commit is contained in:
Simon 2023-05-18 20:01:38 +00:00 committed by Simon
commit a28fea0cc7
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.vscode/launch.json vendored
View File

@ -12,7 +12,8 @@
"start" "start"
], ],
"env": { "env": {
"ENTRY_FOLDER": "${workspaceFolder}/test", "CI_PROJECT_DIR": "${workspaceFolder}",
"ENTRY_FOLDER": "test",
"PACKAGE_NAME": "valid_set" "PACKAGE_NAME": "valid_set"
}, },
"skipFiles": [ "skipFiles": [
@ -30,7 +31,8 @@
"test" "test"
], ],
"env": { "env": {
"ENTRY_FOLDER": "${workspaceFolder}/test", "CI_PROJECT_DIR": "${workspaceFolder}",
"ENTRY_FOLDER": "test",
"PACKAGE_NAME": "valid_set" "PACKAGE_NAME": "valid_set"
}, },
"skipFiles": [ "skipFiles": [
@ -51,7 +53,8 @@
"--color=yes" "--color=yes"
], ],
"env": { "env": {
"ENTRY_FOLDER": "${workspaceFolder}/test", "CI_PROJECT_DIR": "${workspaceFolder}",
"ENTRY_FOLDER": "test",
"PACKAGE_NAME": "valid_set" "PACKAGE_NAME": "valid_set"
}, },
"justMyCode": true "justMyCode": true
@ -67,7 +70,8 @@
"start" "start"
], ],
"env": { "env": {
"ENTRY_FOLDER": "${workspaceFolder}/test", "CI_PROJECT_DIR": "${workspaceFolder}",
"ENTRY_FOLDER": "test",
"PACKAGE_NAME": "existing_valid_theme_set" "PACKAGE_NAME": "existing_valid_theme_set"
}, },
"skipFiles": [ "skipFiles": [
@ -85,7 +89,8 @@
"test" "test"
], ],
"env": { "env": {
"ENTRY_FOLDER": "${workspaceFolder}/test", "CI_PROJECT_DIR": "${workspaceFolder}",
"ENTRY_FOLDER": "test",
"PACKAGE_NAME": "existing_valid_theme_set" "PACKAGE_NAME": "existing_valid_theme_set"
}, },
"skipFiles": [ "skipFiles": [
@ -106,7 +111,8 @@
"--color=yes" "--color=yes"
], ],
"env": { "env": {
"ENTRY_FOLDER": "${workspaceFolder}/test", "CI_PROJECT_DIR": "${workspaceFolder}",
"ENTRY_FOLDER": "test",
"PACKAGE_NAME": "existing_valid_theme_set" "PACKAGE_NAME": "existing_valid_theme_set"
}, },
"justMyCode": true "justMyCode": true

7
src/build-manifest.js
View File

@ -5,10 +5,11 @@ const { exit } = require("process");
// Fetch envs to target the right folder // Fetch envs to target the right folder
const slug = process.env["PACKAGE_NAME"]; const workDir = process.env["CI_PROJECT_DIR"];
const root = process.env["ENTRY_FOLDER"]; const root = process.env["ENTRY_FOLDER"];
if (!slug || !root) exit(1); const slug = process.env["PACKAGE_NAME"];
let workingDirectory = path.join(root, slug); if (!workDir || !slug || !root) exit(1);
let workingDirectory = path.join(workDir, root, slug);
// extract metadata from them // extract metadata from them
fs.readdir(workingDirectory, (err, files) => { fs.readdir(workingDirectory, (err, files) => {

4
src/manifest.spec.js
View File

@ -33,11 +33,13 @@ function flatReferences(manifest) {
describe('Mandatory Checks', function () { describe('Mandatory Checks', function () {
before(function () { before(function () {
const workDir = process.env["CI_PROJECT_DIR"];
expect(workDir).to.be.a("string").that.is.not.empty;
const slug = process.env["PACKAGE_NAME"]; const slug = process.env["PACKAGE_NAME"];
expect(slug).to.be.a("string").that.is.not.empty; expect(slug).to.be.a("string").that.is.not.empty;
const root = process.env["ENTRY_FOLDER"]; const root = process.env["ENTRY_FOLDER"];
expect(root).to.be.a("string").that.is.not.empty; expect(root).to.be.a("string").that.is.not.empty;
workingDirectory = path.join(root, slug); workingDirectory = path.join(workDir, root, slug);
files = fs.readdirSync(workingDirectory); files = fs.readdirSync(workingDirectory);
expect(files).to.be.an('array').that.is.not.empty; expect(files).to.be.an('array').that.is.not.empty;
validator = ajv.compile(JSON.parse(fs.readFileSync(themeSchemaFile, 'utf8'))); validator = ajv.compile(JSON.parse(fs.readFileSync(themeSchemaFile, 'utf8')));

5
src/test_images.py
View File

@ -40,9 +40,10 @@ def _validate_brightness_image(working_path, theme_config, high_light, image_lis
@pytest.fixture @pytest.fixture
def working_path(): def working_path():
# get the global variables containing gitlab-given project slug. # get the global variables containing gitlab-given project slug.
work_directory = os.environ["CI_PROJECT_DIR"]
entry_folder = os.environ["ENTRY_FOLDER"]
project_slug = os.environ["PACKAGE_NAME"] project_slug = os.environ["PACKAGE_NAME"]
root_folder = os.environ["ENTRY_FOLDER"] working_path = Path(work_directory, entry_folder, project_slug)
working_path = Path(root_folder, project_slug)
if not working_path.is_dir(): if not working_path.is_dir():
raise FileNotFoundError(f"No project found for the given {working_path}.") raise FileNotFoundError(f"No project found for the given {working_path}.")
return working_path return working_path