From beff6a8fa0df3f0267fa521b1df2d2d7fd38524e Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Tue, 9 Jan 2024 17:03:02 +0100 Subject: [PATCH 1/7] [AAE-17674] Solve deprecation warning in the theme creation Solve deprecation warning in the theme creation --- .../custom-theme/theme/custom-palette-creator.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/core/custom-theme/theme/custom-palette-creator.scss b/lib/core/custom-theme/theme/custom-palette-creator.scss index 82128075306..8e2141d6ff4 100644 --- a/lib/core/custom-theme/theme/custom-palette-creator.scss +++ b/lib/core/custom-theme/theme/custom-palette-creator.scss @@ -3,9 +3,9 @@ @use 'sass:color'; @function multiply($fore, $back) { - $red: color.red($back) * color.red($fore) / 255; - $green: color.green($back) * color.green($fore) / 255; - $blue: color.blue($back) * color.blue($fore) / 255; + $red: math.div(color.green($back) * color.green($fore), 255); + $green: math.div(color.green($back) * color.green($fore), 255); + $blue: math.div(color.blue($back) * color.blue($fore), 255) @return rgb($red, $green, $blue); } @@ -19,12 +19,12 @@ @each $name, $value in $colors { $adjusted: 0; - $value: $value / 255; + $value: math.div($value, 255); @if ($value < 0.0393) { $value: $value / 12.92; } @else { - $value: ($value + 0.055) / 1.055; + $value: math.div($value + 0.055, 1.055); $value: math.pow($value, 2.4); } From 3e5f6abde3497136f920fc569635b9b2e82150f2 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Tue, 9 Jan 2024 17:22:45 +0100 Subject: [PATCH 2/7] Update custom-palette-creator.scss --- lib/core/custom-theme/theme/custom-palette-creator.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/core/custom-theme/theme/custom-palette-creator.scss b/lib/core/custom-theme/theme/custom-palette-creator.scss index 8e2141d6ff4..6830d35abec 100644 --- a/lib/core/custom-theme/theme/custom-palette-creator.scss +++ b/lib/core/custom-theme/theme/custom-palette-creator.scss @@ -3,8 +3,8 @@ @use 'sass:color'; @function multiply($fore, $back) { - $red: math.div(color.green($back) * color.green($fore), 255); - $green: math.div(color.green($back) * color.green($fore), 255); + $red: math.div(color.green($back) * color.green($fore), 255); + $green: math.div(color.green($back) * color.green($fore), 255); $blue: math.div(color.blue($back) * color.blue($fore), 255) @return rgb($red, $green, $blue); From 4c8d145c1492db3fc1fd54ee5d51f90adac481d2 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Tue, 9 Jan 2024 17:23:36 +0100 Subject: [PATCH 3/7] Update custom-palette-creator.scss --- lib/core/custom-theme/theme/custom-palette-creator.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/core/custom-theme/theme/custom-palette-creator.scss b/lib/core/custom-theme/theme/custom-palette-creator.scss index 6830d35abec..10d8c8c3d5a 100644 --- a/lib/core/custom-theme/theme/custom-palette-creator.scss +++ b/lib/core/custom-theme/theme/custom-palette-creator.scss @@ -3,7 +3,7 @@ @use 'sass:color'; @function multiply($fore, $back) { - $red: math.div(color.green($back) * color.green($fore), 255); + $red: math.div(color.red($back) * color.red($fore), 255); $green: math.div(color.green($back) * color.green($fore), 255); $blue: math.div(color.blue($back) * color.blue($fore), 255) From 35859cc397afc35a0b43be10e01bc585580322df Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Tue, 9 Jan 2024 17:24:42 +0100 Subject: [PATCH 4/7] Update custom-palette-creator.scss --- lib/core/custom-theme/theme/custom-palette-creator.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/core/custom-theme/theme/custom-palette-creator.scss b/lib/core/custom-theme/theme/custom-palette-creator.scss index 10d8c8c3d5a..54730f2fca1 100644 --- a/lib/core/custom-theme/theme/custom-palette-creator.scss +++ b/lib/core/custom-theme/theme/custom-palette-creator.scss @@ -22,7 +22,7 @@ $value: math.div($value, 255); @if ($value < 0.0393) { - $value: $value / 12.92; + $value: math.div($value, 12.92); } @else { $value: math.div($value + 0.055, 1.055); $value: math.pow($value, 2.4); From 1241b9d164c153e0c888697bb054323a84310e31 Mon Sep 17 00:00:00 2001 From: eromano Date: Fri, 12 Jan 2024 18:14:35 +0100 Subject: [PATCH 5/7] fix upgrade download upload --- .github/actions/artifact-append/action.yml | 2 ++ .github/actions/artifact-extract/action.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/actions/artifact-append/action.yml b/.github/actions/artifact-append/action.yml index 146ccacb67a..6a2f53455eb 100644 --- a/.github/actions/artifact-append/action.yml +++ b/.github/actions/artifact-append/action.yml @@ -25,6 +25,8 @@ runs: uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0 with: name: ${{ inputs.artifact-name }} + pattern: ${{ inputs.artifact-name }}-* + merge-multiple: true - run: ls shell: bash - name: Append content diff --git a/.github/actions/artifact-extract/action.yml b/.github/actions/artifact-extract/action.yml index 33b05f701c3..96146855637 100644 --- a/.github/actions/artifact-extract/action.yml +++ b/.github/actions/artifact-extract/action.yml @@ -31,6 +31,8 @@ runs: uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0 with: name: ${{ inputs.artifact-name }} + pattern: ${{ inputs.artifact-name }}-* + merge-multiple: true - id: extract shell: bash run: | From f8b00d1e3762669c0917a780a333f183a1c90fba Mon Sep 17 00:00:00 2001 From: eromano Date: Fri, 12 Jan 2024 18:37:31 +0100 Subject: [PATCH 6/7] fix upgrade download upload --- .github/actions/e2e/action.yml | 2 +- .github/workflows/pull-request.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/e2e/action.yml b/.github/actions/e2e/action.yml index b3fd168e5f9..4753c71ff54 100644 --- a/.github/actions/e2e/action.yml +++ b/.github/actions/e2e/action.yml @@ -177,7 +177,7 @@ runs: if: ${{ steps.determine-affected.outputs.isAffected == 'true' && github.event_name == 'schedule' && failure() }} uses: ./.github/actions/artifact-append with: - artifact-name: global-e2e-result + artifact-name: "global-e2e-result-${{ inputs.e2e-test-id }}" file-name: e2e-failures.txt content: "${{ inputs.e2e-test-id }}" diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 6970f896678..f70b31dd994 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -490,7 +490,7 @@ jobs: if: ${{ github.event_name == 'schedule' }} uses: ./.github/actions/artifact-extract with: - artifact-name: global-e2e-result + artifact-name: "global-e2e-result-${{ matrix.e2e-test.test-id }}" file-name: e2e-failures.txt - name: identify-slack-group id: groups From 66ddd1c355f86f2a8e6c88a715213a39b25c8dae Mon Sep 17 00:00:00 2001 From: eromano Date: Fri, 12 Jan 2024 19:25:23 +0100 Subject: [PATCH 7/7] Revert "fix upgrade download upload" This reverts commit 1241b9d164c153e0c888697bb054323a84310e31. --- .github/actions/artifact-append/action.yml | 4 ++-- .github/actions/artifact-extract/action.yml | 2 +- .github/actions/artifact-initialize/action.yml | 4 ++-- .github/actions/e2e/action.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/artifact-append/action.yml b/.github/actions/artifact-append/action.yml index 6a2f53455eb..72af186b112 100644 --- a/.github/actions/artifact-append/action.yml +++ b/.github/actions/artifact-append/action.yml @@ -22,7 +22,7 @@ runs: - run: echo "Artifact Append" shell: bash - name: Download artifact - uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0 + uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 with: name: ${{ inputs.artifact-name }} pattern: ${{ inputs.artifact-name }}-* @@ -85,7 +85,7 @@ runs: } } - name: Upload artifact - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 + uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 with: name: ${{ inputs.artifact-name }} path: ${{ inputs.file-name }} diff --git a/.github/actions/artifact-extract/action.yml b/.github/actions/artifact-extract/action.yml index 96146855637..1008d85aeb4 100644 --- a/.github/actions/artifact-extract/action.yml +++ b/.github/actions/artifact-extract/action.yml @@ -28,7 +28,7 @@ runs: - run: echo "Artifact Extract" shell: bash - name: Download artifact - uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0 + uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 with: name: ${{ inputs.artifact-name }} pattern: ${{ inputs.artifact-name }}-* diff --git a/.github/actions/artifact-initialize/action.yml b/.github/actions/artifact-initialize/action.yml index 9867b48187f..b06193eb375 100644 --- a/.github/actions/artifact-initialize/action.yml +++ b/.github/actions/artifact-initialize/action.yml @@ -22,11 +22,11 @@ runs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Create empty artifact shell: bash - run: + run: echo "${{inputs.content}}" > ${{ inputs.file-name }} - name: Upload artifact - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 + uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 with: name: ${{ inputs.artifact-name }} path: ${{ inputs.file-name }} diff --git a/.github/actions/e2e/action.yml b/.github/actions/e2e/action.yml index 4753c71ff54..61bc1b1ae8e 100644 --- a/.github/actions/e2e/action.yml +++ b/.github/actions/e2e/action.yml @@ -184,7 +184,7 @@ runs: - name: upload artifacts on gh id: upload_gh if: ${{ steps.determine-affected.outputs.isAffected == 'true' }} - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0 + uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 with: name: e2e-artifact-output path: /home/runner/work/alfresco-ng2-components/alfresco-ng2-components/e2e-output-*