From a8dac60b0813bd0929d06c612e0d4392b21805dc Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Tue, 1 Nov 2022 15:37:32 +0100 Subject: [PATCH] Revert "workflows: work around missing node-canvas binaries for node 18" This reverts commit 0ab270539ae9ba4ec0b34af9624e7d870f4515da. Signed-off-by: Patrik Oldsberg --- .github/workflows/ci.yml | 7 ------- .github/workflows/deploy_nightly.yml | 2 -- .github/workflows/deploy_packages.yml | 8 -------- .github/workflows/verify_e2e-linux.yml | 6 ------ .github/workflows/verify_e2e-techdocs.yml | 7 ------- .github/workflows/verify_e2e-windows.yml | 10 ---------- .github/workflows/verify_kubernetes.yml | 6 ------ .github/workflows/verify_windows.yml | 9 --------- 8 files changed, 55 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1d8040e993..3ab979593c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,13 +32,6 @@ jobs: node-version: ${{ matrix.node-version }} registry-url: https://registry.npmjs.org/ # Needed for auth - # Needed until there are pre-built binaries of node-canvas for Node 18 - - name: node-canvas dependencies - if: matrix.node-version == '18.x' - run: | - sudo apt update - sudo apt install -y build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev - - name: yarn install uses: backstage/actions/yarn-install@v0.5.6 with: diff --git a/.github/workflows/deploy_nightly.yml b/.github/workflows/deploy_nightly.yml index bb41481cb1..74dc60783a 100644 --- a/.github/workflows/deploy_nightly.yml +++ b/.github/workflows/deploy_nightly.yml @@ -25,8 +25,6 @@ jobs: with: node-version: ${{ matrix.node-version }} registry-url: https://registry.npmjs.org/ # Needed for auth - - # Needed until there are pre-built binaries for Node 18 - name: yarn install uses: backstage/actions/yarn-install@v0.5.6 with: diff --git a/.github/workflows/deploy_packages.yml b/.github/workflows/deploy_packages.yml index 6fffe4d60a..56ff61c75b 100644 --- a/.github/workflows/deploy_packages.yml +++ b/.github/workflows/deploy_packages.yml @@ -66,14 +66,6 @@ jobs: with: node-version: ${{ matrix.node-version }} registry-url: https://registry.npmjs.org/ # Needed for auth - - # Needed until there are pre-built binaries of node-canvas for Node 18 - - name: node-canvas dependencies - if: matrix.node-version == '18.x' - run: | - sudo apt update - sudo apt install -y build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev - - name: yarn install uses: backstage/actions/yarn-install@v0.5.6 with: diff --git a/.github/workflows/verify_e2e-linux.yml b/.github/workflows/verify_e2e-linux.yml index db8f6662fe..fefdd1fdd5 100644 --- a/.github/workflows/verify_e2e-linux.yml +++ b/.github/workflows/verify_e2e-linux.yml @@ -51,12 +51,6 @@ jobs: with: node-version: ${{ matrix.node-version }} registry-url: https://registry.npmjs.org/ # Needed for auth - # Needed until there are pre-built binaries of node-canvas for Node 18 - - name: node-canvas dependencies - if: matrix.node-version == '18.x' - run: | - sudo apt update - sudo apt install -y build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev - name: yarn install uses: backstage/actions/yarn-install@v0.5.6 with: diff --git a/.github/workflows/verify_e2e-techdocs.yml b/.github/workflows/verify_e2e-techdocs.yml index 0d6836ad3a..8d59d15899 100644 --- a/.github/workflows/verify_e2e-techdocs.yml +++ b/.github/workflows/verify_e2e-techdocs.yml @@ -28,13 +28,6 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v3 - # Needed until there are pre-built binaries of node-canvas for Node 18 - - name: node-canvas dependencies - if: matrix.node-version == '18.x' - run: | - sudo apt update - sudo apt install -y build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev - - name: install dependencies run: yarn install --immutable diff --git a/.github/workflows/verify_e2e-windows.yml b/.github/workflows/verify_e2e-windows.yml index 9d1ba8a154..fc29c1f03b 100644 --- a/.github/workflows/verify_e2e-windows.yml +++ b/.github/workflows/verify_e2e-windows.yml @@ -52,16 +52,6 @@ jobs: uses: microsoft/setup-msbuild@v1.0.3 - name: setup chrome uses: browser-actions/setup-chrome@latest - - # Needed until there are pre-built binaries of node-canvas for Node 18 - - name: node-canvas dependencies - if: matrix.node-version == '18.x' - # From https://github.com/Automattic/node-canvas/blob/master/.github/workflows/ci.yaml - run: | - Invoke-WebRequest "https://ftp-osl.osuosl.org/pub/gnome/binaries/win64/gtk+/2.22/gtk+-bundle_2.22.1-20101229_win64.zip" -OutFile "gtk.zip" - Expand-Archive gtk.zip -DestinationPath "C:\GTK" - Invoke-WebRequest "https://downloads.sourceforge.net/project/libjpeg-turbo/2.0.4/libjpeg-turbo-2.0.4-vc64.exe" -OutFile "libjpeg.exe" -UserAgent NativeHost - .\libjpeg.exe /S - name: yarn install run: yarn install --immutable diff --git a/.github/workflows/verify_kubernetes.yml b/.github/workflows/verify_kubernetes.yml index ea5e3ebe4e..e8c248699a 100644 --- a/.github/workflows/verify_kubernetes.yml +++ b/.github/workflows/verify_kubernetes.yml @@ -27,12 +27,6 @@ jobs: node-version: ${{ matrix.node-version }} registry-url: https://registry.npmjs.org/ # Needed for auth - # Needed until there are pre-built binaries of node-canvas for Node 18 - - name: node-canvas dependencies - if: matrix.node-version == '18.x' - run: | - sudo apt update - sudo apt install -y build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev - name: yarn install uses: backstage/actions/yarn-install@v0.5.6 with: diff --git a/.github/workflows/verify_windows.yml b/.github/workflows/verify_windows.yml index a092c8d405..75a0633cbe 100644 --- a/.github/workflows/verify_windows.yml +++ b/.github/workflows/verify_windows.yml @@ -32,15 +32,6 @@ jobs: node-version: ${{ matrix.node-version }} registry-url: https://registry.npmjs.org/ # Needed for auth - # Needed until there are pre-built binaries of node-canvas for Node 18 - - name: node-canvas dependencies - if: matrix.node-version == '18.x' - # From https://github.com/Automattic/node-canvas/blob/master/.github/workflows/ci.yaml - run: | - Invoke-WebRequest "https://ftp-osl.osuosl.org/pub/gnome/binaries/win64/gtk+/2.22/gtk+-bundle_2.22.1-20101229_win64.zip" -OutFile "gtk.zip" - Expand-Archive gtk.zip -DestinationPath "C:\GTK" - Invoke-WebRequest "https://downloads.sourceforge.net/project/libjpeg-turbo/2.0.4/libjpeg-turbo-2.0.4-vc64.exe" -OutFile "libjpeg.exe" -UserAgent NativeHost - .\libjpeg.exe /S # Windows file operation slowness means there's no point caching this - name: yarn install run: yarn install --immutable