فهرست منبع

Combine WoW64 and NTSYNC workflows

Kron4ek 3 ماه پیش
والد
کامیت
6616c395f5
4فایلهای تغییر یافته به همراه6 افزوده شده و 33 حذف شده
  1. 3 2
      .github/workflows/wine-exp-wow64.yml
  2. 0 30
      .github/workflows/wine-ntsync.yml
  3. 2 0
      .github/workflows/wine-stable.yml
  4. 1 1
      build_wine.sh

+ 3 - 2
.github/workflows/wine-exp-wow64.yml

@@ -1,4 +1,4 @@
-name: Wine-32on64-WoW64 CI
+name: Wine-WoW64-NTSYNC CI
 
 on:
   schedule:
@@ -29,8 +29,9 @@ jobs:
           WINE_BRANCH=vanilla ./build_wine.sh
           WINE_BRANCH=staging ./build_wine.sh
           WINE_BRANCH=staging-tkg ./build_wine.sh
+          WINE_BRANCH=staging-tkg-ntsync ./build_wine.sh
           sha256sum *.tar.xz
       - uses: actions/upload-artifact@v4
         with:
-          name: Wine-32on64-WoW64
+          name: Wine-WoW64-NTSYNC
           path: ./*.tar.xz

+ 0 - 30
.github/workflows/wine-ntsync.yml

@@ -1,30 +0,0 @@
-name: Wine NTSYNC CI
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Download artifact
-        id: download-artifact
-        uses: dawidd6/action-download-artifact@v3
-        with:
-          workflow: bootstraps.yml
-          workflow_conclusion: success
-          path: /opt
-      - name: Build Wine
-        run: |
-          sudo apt update
-          sudo apt install debootstrap perl git wget xz-utils bubblewrap autoconf
-          sudo tar -C /opt -xpf /opt/Bootstraps/bootstraps.tar.xz
-          chmod +x build_wine.sh
-          WINE_BRANCH=staging-tkg-ntsync ./build_wine.sh
-          sha256sum *.tar.xz
-      - uses: actions/upload-artifact@v4
-        with:
-          name: Wine-Staging-TkG-ntsync
-          path: ./*.tar.xz

+ 2 - 0
.github/workflows/wine-stable.yml

@@ -1,6 +1,8 @@
 name: Wine Stable
 
 on:
+  schedule:
+    - cron:  '0 0 1 * *'
   workflow_dispatch:
 
 jobs:

+ 1 - 1
build_wine.sh

@@ -207,7 +207,7 @@ if [ -n "${CUSTOM_SRC_PATH}" ]; then
 	WINE_VERSION="$(cat wine/VERSION | tail -c +14)"
 	BUILD_NAME="${WINE_VERSION}"-custom
 elif [ "$WINE_BRANCH" = "staging-tkg" ] || [ "$WINE_BRANCH" = "staging-tkg-ntsync" ]; then
-	if [ "${EXPERIMENTAL_WOW64}" = "true" ]; then
+	if [ "$WINE_BRANCH" = "staging-tkg" ] && [ "${EXPERIMENTAL_WOW64}" = "true" ]; then
 		git clone https://github.com/Kron4ek/wine-tkg wine -b wow64
 	else
 		if [ "$WINE_BRANCH" = "staging-tkg" ]; then