Skip to content

Commit

Permalink
fix tar paths
Browse files Browse the repository at this point in the history
  • Loading branch information
apprehensions committed Feb 17, 2024
1 parent dcce677 commit e36b5c3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 29 deletions.
15 changes: 8 additions & 7 deletions .github/workflows/wine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@ on:
permissions:
contents: read
env:
WINE_PREFIX: ${{ github.workspace }}/wine-build
WINE_VERSION: 9.2
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: 'Install Wine dependencies'
- name: 'Setup environment'
run: |
echo "WINE_ARCHIVE=${{ github.workspace }}/wine-vinegarhq-build-${{ env.WINE_VERSION }}.tar.xz" >> $GITHUB_ENV
echo "WINE_PREFIX=${{ github.workspace }}/wine-vinegarhq-build-${{ env.WINE_VERSION }}" >> $GITHUB_ENV
echo "PATH=/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" >> $GITHUB_ENV
sudo apt update -y
sudo apt install \
git \
Expand Down Expand Up @@ -45,9 +48,6 @@ jobs:
- name: 'Configure ccache'
uses: hendrikmuhs/ccache-action@v1.2
- name: 'Setup ccache'
run: |
echo "PATH=/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" >> $GITHUB_ENV

- name: 'Checkout Repository'
uses: actions/checkout@v3
Expand All @@ -74,7 +74,6 @@ jobs:
- name: 'Configure Wine'
working-directory: wine
run: |
echo "WINE_ARCHIVE=${{ github.workspace }}/wine-vinegarhq-build-${{ env.WINE_VERSION }}.tar.xz" >> $GITHUB_ENV
./configure \
CC='ccache gcc' \
x86_64_CC='ccache x86_64-w64-mingw32-gcc' \
Expand Down Expand Up @@ -110,14 +109,16 @@ jobs:
- name: 'Install Wine'
working-directory: wine
run: make install LDCONFIG=/bin/true UPDATE_DESKTOP_DATABASE=/bin/true

- name: 'Strip Wine'
working-directory: ${{ env.WINE_PREFIX }}
run: |
x86_64-w64-mingw32-strip --strip-unneeded lib/wine/x86_64-windows/*.dll
- name: Make artifacts
run: |
XZ_OPT=-9 tar -Jcf ${{ env.WINE_ARCHIVE }} ${{ env.WINE_PREFIX }}
XZ_OPT=-9 tar -Jcf ${{ env.WINE_ARCHIVE }} $(basename ${{ env.WINE_PREFIX }})
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
Expand Down
22 changes: 0 additions & 22 deletions loader-prefer-winedllpath.patch

This file was deleted.

0 comments on commit e36b5c3

Please sign in to comment.