From 7840764da05fe20f13d55f307d2bd80a154b9f06 Mon Sep 17 00:00:00 2001 From: nicomiguelino Date: Thu, 25 Jul 2024 17:35:44 +0000 Subject: [PATCH 1/4] fix: enable TTY in the webview CI workflow --- .github/workflows/build-webview.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-webview.yaml b/.github/workflows/build-webview.yaml index 932da777b..790a3dea2 100644 --- a/.github/workflows/build-webview.yaml +++ b/.github/workflows/build-webview.yaml @@ -84,6 +84,7 @@ jobs: ls -lah /tmp/.cache - name: Start compilation + shell: 'script -q -e -c "bash {0}"' run: | cd webview docker run -itd \ From c22097612d593cf87ad4accf479cad0d374186b5 Mon Sep 17 00:00:00 2001 From: nicomiguelino Date: Thu, 25 Jul 2024 17:41:19 +0000 Subject: [PATCH 2/4] test: check to see if the changes are working --- .github/workflows/build-webview.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-webview.yaml b/.github/workflows/build-webview.yaml index 790a3dea2..fb8c2d850 100644 --- a/.github/workflows/build-webview.yaml +++ b/.github/workflows/build-webview.yaml @@ -1,6 +1,9 @@ name: Build Webview on: + pull_request: + branches: + - master push: branches: - master @@ -95,7 +98,7 @@ jobs: -v $(pwd):/webview:ro \ -e TARGET=${{ matrix.board }} \ screenly/ose-qt-builder:latest - docker exec -it qt-builder /webview/build_qt5.sh + docker exec -it qt-builder cat /etc/os-release docker rm -f qt-builder - uses: actions/upload-artifact@v3 From 7c78889edb376c530a49bacf593584f665e31ec7 Mon Sep 17 00:00:00 2001 From: nicomiguelino Date: Thu, 25 Jul 2024 17:51:40 +0000 Subject: [PATCH 3/4] test: temporarily disable Docker image push --- .github/workflows/build-webview.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-webview.yaml b/.github/workflows/build-webview.yaml index fb8c2d850..bf844deb3 100644 --- a/.github/workflows/build-webview.yaml +++ b/.github/workflows/build-webview.yaml @@ -38,7 +38,7 @@ jobs: run: | echo ::set-output name=buildx_args::\ --cache-from "screenly/ose-qt-builder:latest" \ - --output "type=image,push=true" \ + --output "type=image,push=false" \ --build-arg "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ --build-arg "GIT_HASH=$GITHUB_SHA" \ --build-arg "GIT_SHORT_HASH=$(git rev-parse --short HEAD)" \ From b43c810b5821ea01f4403affac9af0e3dd9d674c Mon Sep 17 00:00:00 2001 From: nicomiguelino Date: Thu, 25 Jul 2024 18:10:41 +0000 Subject: [PATCH 4/4] fix: revert temporary changes --- .github/workflows/build-webview.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-webview.yaml b/.github/workflows/build-webview.yaml index bf844deb3..790a3dea2 100644 --- a/.github/workflows/build-webview.yaml +++ b/.github/workflows/build-webview.yaml @@ -1,9 +1,6 @@ name: Build Webview on: - pull_request: - branches: - - master push: branches: - master @@ -38,7 +35,7 @@ jobs: run: | echo ::set-output name=buildx_args::\ --cache-from "screenly/ose-qt-builder:latest" \ - --output "type=image,push=false" \ + --output "type=image,push=true" \ --build-arg "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ --build-arg "GIT_HASH=$GITHUB_SHA" \ --build-arg "GIT_SHORT_HASH=$(git rev-parse --short HEAD)" \ @@ -98,7 +95,7 @@ jobs: -v $(pwd):/webview:ro \ -e TARGET=${{ matrix.board }} \ screenly/ose-qt-builder:latest - docker exec -it qt-builder cat /etc/os-release + docker exec -it qt-builder /webview/build_qt5.sh docker rm -f qt-builder - uses: actions/upload-artifact@v3