Skip to content

Commit

Permalink
Generally favour installing wine64 instead of wine64-development
Browse files Browse the repository at this point in the history
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
1706b03 for some of the CI jobs.
  • Loading branch information
mstorsjo committed Apr 19, 2024
1 parent dd89dc1 commit dc167d8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/projects.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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/*

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit dc167d8

Please sign in to comment.