From fc649e65e556ca0aedc129e383a8febb2f155b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20=C5=A0est=C3=A1k?= Date: Fri, 22 Sep 2023 20:33:14 +0200 Subject: [PATCH 1/2] [CI] Compare artifacts from two builds --- .github/workflows/build.yml | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ea8d68b..7fdcc05 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,6 +35,34 @@ jobs: run: env DOCKER_TAG=bleeding-edge ./dockerenv-github.sh ./pack.sh - name: Upload artifact uses: actions/upload-artifact@v2 + with: + name: site-for-verification + path: pack.zip + + compare: + needs: [build, test-bleeding-edge-java-and-npm] + runs-on: ubuntu-latest + steps: + - name: Download build artifact + uses: actions/download-artifact@v3 with: name: site - path: pack-for-verification.zip + path: ./build + + - name: Download test-bleeding-edge-java-and-npm artifact + uses: actions/download-artifact@v3 + with: + name: site-for-verification + path: ./verification + + - name: Extract build artifact + run: mkdir build/unpacked && unzip -d build/unpacked build/pack.zip + + - name: Extract test-bleeding-edge-java-and-npm artifact + run: mkdir verification/unpacked && unzip -d verification/unpacked verification/pack.zip + + - name: Find + run: find + + - name: Compare artifacts + run: diff --exclude="*.gz" -r build/unpacked verification/unpacked From 19bccf10224a31144d3b8b15762f393bc24d5441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20=C5=A0est=C3=A1k?= Date: Fri, 22 Sep 2023 23:28:34 +0200 Subject: [PATCH 2/2] Fix timezones after 2020 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index f3c9132..d148e5e 100644 --- a/build.sbt +++ b/build.sbt @@ -140,7 +140,7 @@ lazy val client = (project in file("client")).settings( jsDependencies ++= Seq( bootstrap / "bootstrap.min.js", "org.webjars" % "momentjs" % "2.10.6" / "min/moment.min.js", - "org.webjars" % "moment-timezone" % "0.4.0-1" / "moment-timezone-with-data-2010-2020.js" dependsOn "min/moment.min.js", + "org.webjars" % "moment-timezone" % "0.4.0-1" / "moment-timezone-with-data.js" dependsOn "min/moment.min.js", "org.webjars" % "jquery" % "2.1.4" / jqueryName minified "jquery/2.1.4/jquery.min.js", ProvidedJS / "jquery.stickytableheaders.js" /*minified "jquery.stickytableheaders.min.js"*/ dependsOn jqueryName, // Cannot use minified version as it is patched, jqPlot / "jquery.jqplot.min.js" dependsOn jqueryName,