wip

Maks1mS · Sep 17, 2023 · 5958d4a · 5958d4a
1 parent 58c753d
commit 5958d4a
Show file tree

Hide file tree

Showing 22 changed files with 47 additions and 660 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -13,12 +13,9 @@ jobs:
     strategy:
       matrix:
         features:
-          - color
-          - hello
+          - wine
         baseImage:
-          - debian:latest
-          - ubuntu:latest
-          - mcr.microsoft.com/devcontainers/base:ubuntu
+          - mcr.microsoft.com/devcontainers/base:debian
     steps:
       - uses: actions/checkout@v3
 
@@ -34,8 +31,7 @@ jobs:
     strategy:
       matrix:
         features:
-          - color
-          - hello
+          - wine
     steps:
       - uses: actions/checkout@v3
 
@@ -44,15 +40,3 @@ jobs:
 
       - name: "Generating tests for '${{ matrix.features }}' scenarios"
         run: devcontainer features test -f ${{ matrix.features }} --skip-autogenerated --skip-duplicated .
-
-  test-global:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: "Install latest devcontainer CLI"
-        run: npm install -g @devcontainers/cli
-
-      - name: "Testing global scenarios"
-        run: devcontainer features test --global-scenarios-only .
diff --git a/src/color/README.md b/src/color/README.md
diff --git a/src/color/devcontainer-feature.json b/src/color/devcontainer-feature.json
diff --git a/src/color/install.sh b/src/color/install.sh
diff --git a/src/hello/README.md b/src/hello/README.md
diff --git a/src/hello/devcontainer-feature.json b/src/hello/devcontainer-feature.json
diff --git a/src/hello/install.sh b/src/hello/install.sh
diff --git a/src/wine/install.sh b/src/wine/install.sh
@@ -7,26 +7,41 @@ WINEPREFIX="$WINEHOME/.wine32"
 WINEARCH="win32"
 WINEDEBUG=-all
 
-ensure_nanolayer nanolayer_location "v0.5.0"
-
-$nanolayer_location \
-  install \ 
-  apt-get \ 
+install_debian() {
+  export DEBIAN_FRONTEND=noninteractive
+  dpkg --add-architecture i386
+  apt-get update
+  apt-get install -y --no-install-recommends \
     apt-transport-https \
     ca-certificates \
     telnet \
     cabextract \
     gnupg2 \
     wget
 
-wget https://dl.winehq.org/wine-builds/winehq.key -O - | apt-key add -
-echo "deb https://dl.winehq.org/wine-builds/debian bookworm main" > /etc/apt/sources.list.d/winehq.list
-{ \
-	echo "Package: *wine* *wine*:i386"; \
-	echo "Pin: version $WINEVERSION~bookworm"; \
-	echo "Pin-Priority: 1001"; \
-} > /etc/apt/preferences.d/winehq.pref
+  wget https://dl.winehq.org/wine-builds/winehq.key -O - | apt-key add -
+  echo "deb https://dl.winehq.org/wine-builds/debian $VERSION_CODENAME main" >/etc/apt/sources.list.d/winehq.list
+  {
+    echo "Package: *wine* *wine*:i386"
+    echo "Pin: version $WINEVERSION~$VERSION_CODENAME"
+    echo "Pin-Priority: 1001"
+  } >/etc/apt/preferences.d/winehq.pref
+
+  apt-get update
+  apt-get install -y --no-install-recommends winehq-stable
+  wget https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks -O /usr/bin/winetricks
+  chmod +rx /usr/bin/winetricks
+
+  apt purge --auto-remove -y
+  apt autoremove --purge -y
+  rm -rf /var/lib/apt/lists/*
+}
+
+. /etc/os-release
 
-$nanolayer_location install apt-get winehq-stable
-wget https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks -O /usr/bin/winetricks
-chmod +rx /usr/bin/winetricks
+if [ "${ID}" = "debian" ]; then
+  install_debian
+else
+  echo "Linux distro ${ID} not supported."
+  exit 1
+fi