From 4337fa816406c6521e1bd203b1b8005d82fc762f Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@3a-systems.ru>
Date: Wed, 07 Dec 2022 09:54:43 +0000
Subject: [PATCH] BUILD java: [ '8','11','17','19'] + fix install wine32:i386 without conflicts (#265)
---
.github/workflows/deploy.yml | 12 ------------
.github/workflows/release.yml | 12 ------------
.github/workflows/build.yml | 14 +-------------
3 files changed, 1 insertions(+), 37 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9eecda8..af50a74 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@
runs-on: ${{ matrix.os }}
strategy:
matrix:
- java: [ '8','11','16','17','18']
+ java: [ '8','11','17','19']
os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
steps:
- name: Install wine+rpm for distribution
@@ -19,18 +19,6 @@
run: |
set -x -u -o pipefail
source /etc/os-release
- # Get rid of packages installed from ppa:ondrej/php so that we will be able to install wine32:i386 without conflicts
- # (see issue https://github.com/actions/virtual-environments/issues/4589)
- # In detail we:
- # 1. Remove all packages that ppa:ondrej/php has but plain Ubuntu doesn't, i.e. libzip4 and everything PHP
- # 2. Revert (remaining) packages that ppa:ondrej/php and plain Ubuntu share, back to the plain Ubuntu version
- # 3. Assert that no packages from ppa:ondrej/php are left installed
- dpkg -l | grep '^ii' | fgrep deb.sury.org | awk '{print $2}' | grep '^php' \
- | xargs -r -t sudo apt-get remove --yes libzip4
- sudo apt update && sudo apt upgrade
- dpkg -l | grep '^ii' | fgrep deb.sury.org | grep -v libpcre2-posix3 | awk '{print $2}' | sed "s,\$,/${UBUNTU_CODENAME}," \
- | xargs -r -t sudo apt-get install --yes --no-install-recommends --allow-downgrades -V
- ! dpkg -l | grep '^ii' | fgrep deb.sury.org
# Install 32bit Wine
sudo dpkg --add-architecture i386 # for wine32
sudo apt-get update # again, due to new architecture
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index f6ad02d..3d8b408 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -20,18 +20,6 @@
run: |
set -x -u -o pipefail
source /etc/os-release
- # Get rid of packages installed from ppa:ondrej/php so that we will be able to install wine32:i386 without conflicts
- # (see issue https://github.com/actions/virtual-environments/issues/4589)
- # In detail we:
- # 1. Remove all packages that ppa:ondrej/php has but plain Ubuntu doesn't, i.e. libzip4 and everything PHP
- # 2. Revert (remaining) packages that ppa:ondrej/php and plain Ubuntu share, back to the plain Ubuntu version
- # 3. Assert that no packages from ppa:ondrej/php are left installed
- dpkg -l | grep '^ii' | fgrep deb.sury.org | awk '{print $2}' | grep '^php' \
- | xargs -r -t sudo apt-get remove --yes libzip4
- sudo apt update && sudo apt upgrade
- dpkg -l | grep '^ii' | fgrep deb.sury.org | grep -v libpcre2-posix3 | awk '{print $2}' | sed "s,\$,/${UBUNTU_CODENAME}," \
- | xargs -r -t sudo apt-get install --yes --no-install-recommends --allow-downgrades -V
- ! dpkg -l | grep '^ii' | fgrep deb.sury.org
# Install 32bit Wine
sudo dpkg --add-architecture i386 # for wine32
sudo apt-get update # again, due to new architecture
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 11a5112..74f5ab3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,18 +24,6 @@
run: |
set -x -u -o pipefail
source /etc/os-release
- # Get rid of packages installed from ppa:ondrej/php so that we will be able to install wine32:i386 without conflicts
- # (see issue https://github.com/actions/virtual-environments/issues/4589)
- # In detail we:
- # 1. Remove all packages that ppa:ondrej/php has but plain Ubuntu doesn't, i.e. libzip4 and everything PHP
- # 2. Revert (remaining) packages that ppa:ondrej/php and plain Ubuntu share, back to the plain Ubuntu version
- # 3. Assert that no packages from ppa:ondrej/php are left installed
- dpkg -l | grep '^ii' | fgrep deb.sury.org | awk '{print $2}' | grep '^php' \
- | xargs -r -t sudo apt-get remove --yes libzip4
- sudo apt update && sudo apt upgrade
- dpkg -l | grep '^ii' | fgrep deb.sury.org | grep -v libpcre2-posix3 | awk '{print $2}' | sed "s,\$,/${UBUNTU_CODENAME}," \
- | xargs -r -t sudo apt-get install --yes --no-install-recommends --allow-downgrades -V
- ! dpkg -l | grep '^ii' | fgrep deb.sury.org
# Install 32bit Wine
sudo dpkg --add-architecture i386 # for wine32
sudo apt-get update # again, due to new architecture
--
Gitblit v1.10.0