Merge branch 'main' into gold_integration
diff --git a/images/js/helpers/gold.js b/images/js/helpers/gold.js
index 58fd88d..e71071b 100644
--- a/images/js/helpers/gold.js
+++ b/images/js/helpers/gold.js
@@ -6,7 +6,6 @@
try {
const googleEnvSecret = process.env.GOOGLE_CLOUD_STORAGE;
const keyString = Buffer.from(googleEnvSecret, 'base64').toString('ascii');
- // console.log('KEYSTRING ===> ', keyString);
await writeToPromise('./secret.json', keyString);
return true;
} catch (err) {
@@ -31,6 +30,8 @@
const githubCommit = process.env.GITHUB_SHA;
// initalizes the process
await execToPromise(`goldctl imgtest init --work-dir ./tmp --commit ${githubCommit} --keys-file ./keys.json --instance lottie-animation-community --bucket lottie-animation-community-tests`);
+ console.log('IMAGE INITIALIZE');
+ console.log(`goldctl imgtest init --work-dir ./tmp --commit ${githubCommit} --keys-file ./keys.json --instance lottie-animation-community --bucket lottie-animation-community-tests`);
};
const uploadImage = async (imagePath, testName) => {
@@ -38,9 +39,9 @@
// Adds an image to the current imgtest process.
// the --test-name argument should be different for each animation
const response = await execToPromise(`goldctl imgtest add --work-dir ./tmp --test-name "${testName}" --png-file "${imagePath}"`);
- console.log('IMAGE UPLOADED');
- console.log(`goldctl imgtest add --work-dir ./tmp --test-name "${testName}" --png-file "${imagePath}"`);
+ console.log('IMAGE UPLOAD SUCCESS');
console.log(response);
+ console.log(`goldctl imgtest add --work-dir ./tmp --test-name "${testName}" --png-file "${imagePath}"`);
} catch (error) {
console.log('IMAGE UPLOAD ERROR', error);
//
@@ -50,9 +51,13 @@
const finalize = async () => {
try {
// finalizes the process
- await execToPromise('goldctl imgtest finalize --work-dir ./tmp');
+ const response = await execToPromise('goldctl imgtest finalize --work-dir ./tmp');
+ console.log('IMAGE FINALIZE');
+ console.log(response);
} catch (error) {
//
+ console.log('FINALIZE ERROR');
+ console.log(error);
}
};
diff --git a/schema/docs/json/effects/angle.json b/schema/docs/json/effects/angle.json
index 4d28023..fb029db 100644
--- a/schema/docs/json/effects/angle.json
+++ b/schema/docs/json/effects/angle.json
@@ -31,7 +31,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "object"
diff --git a/schema/docs/json/effects/checkBox.json b/schema/docs/json/effects/checkBox.json
index a7e9039..5437bb7 100644
--- a/schema/docs/json/effects/checkBox.json
+++ b/schema/docs/json/effects/checkBox.json
@@ -31,7 +31,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "object"
diff --git a/schema/docs/json/effects/dropDown.json b/schema/docs/json/effects/dropDown.json
index a7e9039..5437bb7 100644
--- a/schema/docs/json/effects/dropDown.json
+++ b/schema/docs/json/effects/dropDown.json
@@ -31,7 +31,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "object"
diff --git a/schema/docs/json/effects/slider.json b/schema/docs/json/effects/slider.json
index 6896b5d..30af3ea 100644
--- a/schema/docs/json/effects/slider.json
+++ b/schema/docs/json/effects/slider.json
@@ -31,7 +31,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "object"
diff --git a/schema/docs/json/helpers/mask.json b/schema/docs/json/helpers/mask.json
index 9c5ff58..9bfddfc 100644
--- a/schema/docs/json/helpers/mask.json
+++ b/schema/docs/json/helpers/mask.json
@@ -35,7 +35,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"default": {"a":0, "k":100}
diff --git a/schema/docs/json/helpers/transform.json b/schema/docs/json/helpers/transform.json
index 3e16c9f..ad5e06f 100644
--- a/schema/docs/json/helpers/transform.json
+++ b/schema/docs/json/helpers/transform.json
@@ -80,7 +80,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"default": {"a":0, "k":0},
@@ -94,7 +94,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"default": {"a":0, "k":0},
@@ -108,7 +108,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"default": {"a":0, "k":0},
@@ -122,7 +122,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"default": {"a":0, "k":0},
@@ -136,7 +136,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"default": {"a":0, "k":0},
diff --git a/schema/docs/json/layers/text.json b/schema/docs/json/layers/text.json
index 26149ff..8ede26b 100644
--- a/schema/docs/json/layers/text.json
+++ b/schema/docs/json/layers/text.json
@@ -236,7 +236,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "object"
@@ -249,7 +249,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "object"
@@ -262,7 +262,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "object"
@@ -275,7 +275,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "object"
@@ -288,7 +288,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "object"
@@ -327,7 +327,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "object"
@@ -340,7 +340,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "object"
@@ -353,7 +353,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "object"
@@ -366,7 +366,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "object"
@@ -391,7 +391,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "number"
@@ -404,7 +404,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "number"
@@ -417,7 +417,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "number"
@@ -453,7 +453,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "number"
@@ -466,7 +466,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "number"
@@ -479,7 +479,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "number"
diff --git a/schema/docs/json/properties/doubleKeyframe.json b/schema/docs/json/properties/doubleKeyframe.json
deleted file mode 100644
index cb2e08f..0000000
--- a/schema/docs/json/properties/doubleKeyframe.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-04/schema#",
- "type": "object",
- "properties": {
- "s": {
- "description": "Start value of keyframe segment.",
- "extended_name": "Start",
- "type": "number"
- },
- "t": {
- "description": "Start time of keyframe segment.",
- "extended_name": "Time",
- "type": "number"
- },
- "i": {
- "description": "Bezier curve interpolation in value.",
- "extended_name": "In Value",
- "properties": {
- "x": {
- "description": "bezier x axis. Array of numbers.",
- "extended_name": "X axis",
- "type": "array"
- },
- "y": {
- "description": "bezier y axis. Array of numbers.",
- "extended_name": "Y axis",
- "type": "array"
- }
- },
- "type": "object"
- },
- "o": {
- "description": "Bezier curve interpolation out value.",
- "extended_name": "Out Value",
- "properties": {
- "x": {
- "description": "bezier x axis. Array of numbers.",
- "extended_name": "X axis",
- "type": "array"
- },
- "y": {
- "description": "bezier y axis. Array of numbers.",
- "extended_name": "Y axis",
- "type": "array"
- }
- },
- "type": "object"
- }
- }
-}
\ No newline at end of file
diff --git a/schema/docs/json/properties/valueKeyframe.json b/schema/docs/json/properties/valueKeyframe.json
deleted file mode 100644
index 4aa78e7..0000000
--- a/schema/docs/json/properties/valueKeyframe.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-04/schema",
- "type": "object",
- "properties": {
- "s": {
- "description": "Start value of keyframe segment.",
- "extended_name": "Start",
- "type": "number"
- },
- "t": {
- "description": "Start time of keyframe segment.",
- "extended_name": "Time",
- "type": "number"
- },
- "i": {
- "description": "Bezier curve interpolation in value.",
- "extended_name": "In Value",
- "type": "object",
- "properties": {
- "x": {
- "description": "bezier x axis",
- "extended_name": "X axis",
- "type": "number"
- },
- "y": {
- "description": "bezier y axis",
- "extended_name": "Y axis",
- "type": "number"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/schema/docs/json/properties/valueKeyframed.json b/schema/docs/json/properties/valueKeyframed.json
deleted file mode 100644
index ed5d8c1..0000000
--- a/schema/docs/json/properties/valueKeyframed.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-04/schema#",
- "type": "object",
- "properties": {
- "k": {
- "description": "Property Value keyframes",
- "extended_name": "Keyframes",
- "type": "array",
- "items": {
- "type": "object",
- "$ref": "#/properties/valueKeyframe"
- }
- },
- "x": {
- "description": "Property Expression. An AE expression that modifies the value.",
- "extended_name": "Expression",
- "type": "string"
- },
- "ix": {
- "description": "Property Index. Used for expressions.",
- "extended_name": "Property Index",
- "type": "number"
- }
- }
-}
diff --git a/schema/docs/json/shapes/transform.json b/schema/docs/json/shapes/transform.json
index a30fef5..18ca51b 100644
--- a/schema/docs/json/shapes/transform.json
+++ b/schema/docs/json/shapes/transform.json
@@ -54,7 +54,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "object"
@@ -67,7 +67,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "object"
@@ -80,7 +80,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "object"
@@ -93,7 +93,7 @@
"$ref": "#/properties/value"
},
{
- "$ref": "#/properties/valueKeyframed"
+ "$ref": "#/properties/multiDimensionalKeyframed"
}
],
"type": "object"
