From 23058baf06bbc2a67edc1550be790797034d3138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 18 Apr 2024 23:21:53 +0300 Subject: [PATCH 1/3] docker: Explicilty install xz-utils for unpacking the llvm tarball --- Dockerfile.clang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.clang b/Dockerfile.clang index 66f82b1..341da40 100644 --- a/Dockerfile.clang +++ b/Dockerfile.clang @@ -2,7 +2,7 @@ ARG BASE=msvc-wine FROM $BASE RUN apt-get update && \ - apt-get install -y curl && \ + apt-get install -y curl xz-utils && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* From c7468384968717b8109d83eddde8beaf571e60a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 9 Apr 2024 11:17:12 +0300 Subject: [PATCH 2/3] docker: Update the dockerfile to Ubuntu 22.04 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 46c030d..eb5957b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 RUN apt-get update && \ apt-get install -y wine64-development python3 msitools ca-certificates && \ From 102635217b0e0ae5fd59980b1600e7c46b711f89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 18 Apr 2024 23:02:16 +0300 Subject: [PATCH 3/3] Generally favour installing wine64 instead of wine64-development Currently on Ubuntu 22.04, wine64-development provides Wine 6.0.0, while wine64 provides Wine 6.0.3. This matches what was done in 1706b03809e9b98fc94445a641d6921ccc250aff for some of the CI jobs. --- .github/workflows/projects.yml | 6 +++--- Dockerfile | 2 +- README.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/projects.yml b/.github/workflows/projects.yml index 2a3e339..a523023 100644 --- a/.github/workflows/projects.yml +++ b/.github/workflows/projects.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Install prerequisites run: | - sudo apt-get update && sudo apt-get install wine64-development python3 msitools ca-certificates ninja-build winbind meson nasm + sudo apt-get update && sudo apt-get install wine64 python3 msitools ca-certificates ninja-build winbind meson nasm wine64 wineboot - uses: actions/checkout@v4 - name: Download MSVC @@ -78,7 +78,7 @@ jobs: steps: - name: Install prerequisites run: | - sudo apt-get update && sudo apt-get install wine64-development python3 msitools ca-certificates winbind nasm + sudo apt-get update && sudo apt-get install wine64 python3 msitools ca-certificates winbind nasm wine64 wineboot - uses: actions/checkout@v4 - name: Download MSVC @@ -122,7 +122,7 @@ jobs: steps: - name: Install prerequisites run: | - sudo apt-get update && sudo apt-get install wine64-development python3 msitools ca-certificates cmake ninja-build winbind + sudo apt-get update && sudo apt-get install wine64 python3 msitools ca-certificates cmake ninja-build winbind wine64 wineboot - uses: actions/checkout@v4 - name: Download MSVC diff --git a/Dockerfile b/Dockerfile index eb5957b..e5a6348 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:22.04 RUN apt-get update && \ - apt-get install -y wine64-development python3 msitools ca-certificates && \ + apt-get install -y wine64 python3 msitools ca-certificates && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* diff --git a/README.md b/README.md index dea240f..25a614e 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ The following instructions are for setting up MSVC without docker. ```bash apt-get update -apt-get install -y wine64-development python3 msitools ca-certificates winbind +apt-get install -y wine64 python3 msitools ca-certificates winbind ``` ## Installation