From 2b09a9410f13b43ed477a3687de39cd513814910 Mon Sep 17 00:00:00 2001
From: Jesse Bannon <jbann1994@gmail.com>
Date: Thu, 23 Feb 2023 11:45:16 -0800
Subject: [PATCH] Revert "steps in container"

This reverts commit ec21ffee90fff4e8e64529a3d8efa20e925e832c.
---
 .github/workflows/release.yaml | 82 ++++++++++++++++++----------------
 1 file changed, 43 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 39f5a25a..ad0ec1ed 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -63,46 +63,44 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: quay.io/pypa/manylinux_2_28_x86_64
-      volumes:
-        - /opt/builds:/opt/builds
-      steps:
-        - uses: actions/checkout@v3
-        - name: Write version to init file
-          run: |
-            echo '${{ needs.version.outputs.init_contents }}' > src/ytdl_sub/__init__.py
-        - name: Install base packages
-          run: |
-            cat /etc/os-release
-            dnf update -y
-            dnf install -y epel-release tar wget make gcc openssl-devel bzip2-devel libffi-devel zlib-devel
-        - name: Install zstd
-          run: |
-            wget https://github.com/facebook/zstd/archive/refs/tags/v1.5.4.tar.gz
-            tar -xf v1.5.4.tar.gz
-            cd zstd-1.5.4 && make install
-            zstd --quiet --version
-        - name: Install Python
-          run: |
-            wget https://www.python.org/ftp/python/3.10.10/Python-3.10.10.tar.xz
-            tar -xf Python-3.10.10.tar.xz
-            cd Python-3.10.10 && ./configure --with-ensurepip=install --prefix=/usr/local --enable-shared LDFLAGS="-Wl,-rpath /usr/local/lib"
-            make -j 8
-            make altinstall
-            python3.10 --version
-        - name: Build Package
-          run: |
-            python3.10 -m pip install --upgrade pip
-            python3.10 -m pip install -e .[build]
-            # Build executable
-            pyinstaller ytdl-sub.spec
-            mkdir -p /opt/builds
-            chmod ugo+rwx dist/ytdl-sub
-            dist/ytdl-sub -h
-            mv dist/ytdl-sub /opt/builds/ytdl-sub_linux
-            ls -lh /opt/builds/
-            tar --version
-            zstd --version
     steps:
+      - uses: actions/checkout@v3
+      - name: Write version to init file
+        run: |
+          echo '${{ needs.version.outputs.init_contents }}' > src/ytdl_sub/__init__.py
+      - name: Install base packages
+        run: |
+          cat /etc/os-release
+          dnf update -y
+          dnf install -y epel-release tar wget make gcc openssl-devel bzip2-devel libffi-devel zlib-devel
+      - name: Install zstd
+        run: |
+          wget https://github.com/facebook/zstd/archive/refs/tags/v1.5.4.tar.gz
+          tar -xf v1.5.4.tar.gz
+          cd zstd-1.5.4 && make install
+          zstd --quiet --version
+      - name: Install Python
+        run: |
+          wget https://www.python.org/ftp/python/3.10.10/Python-3.10.10.tar.xz
+          tar -xf Python-3.10.10.tar.xz
+          cd Python-3.10.10 && ./configure --with-ensurepip=install --prefix=/usr/local --enable-shared LDFLAGS="-Wl,-rpath /usr/local/lib"
+          make -j 8
+          make altinstall
+          python3.10 --version
+      - name: Build Package
+        run: |
+          python3.10 -m pip install --upgrade pip
+          python3.10 -m pip install -e .[build]
+          # Build executable
+          pyinstaller ytdl-sub.spec
+          mkdir -p /opt/builds
+          chmod ugo+rwx dist/ytdl-sub
+          dist/ytdl-sub -h
+          mv dist/ytdl-sub /opt/builds/ytdl-sub_linux
+          ls -lh /opt/builds/
+          tar --version
+          zstd --version
+
       - name: Save build to cache
         uses: actions/cache@v3
         with:
@@ -200,6 +198,12 @@ jobs:
       - name: Inspect build directory
         run: |
           ls -lh /opt/builds
+          sudo find / | grep ytdl-sub | true
+
+      - name: Move linux build into dir with other builds
+        run: |
+          sudo mv /root/opt/builds/* /opt/builds
+          sudo chown -R runner:docker /opt/builds
 
       - name: Create Release
         if: ${{ github.ref == 'refs/heads/master' }}