diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 90cfce1b..90b219f8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,8 +60,8 @@ jobs: - uses: actions/upload-artifact@v3 if: ${{ matrix.os == 'windows-latest' }} with: - name: safety-win-i386.exe - path: dist/safety-win-i386.exe + name: safety-win-i686.exe + path: dist/safety-win-i686.exe if-no-files-found: error - uses: actions/upload-artifact@v3 if: ${{ matrix.os == 'windows-latest' }} @@ -69,12 +69,6 @@ jobs: name: safety-win-x86_64.exe path: dist/safety-win-x86_64.exe if-no-files-found: error - - uses: actions/upload-artifact@v3 - if: ${{ matrix.os == 'ubuntu-20.04' }} - with: - name: safety-linux-i386 - path: dist/safety-linux-i386 - if-no-files-found: error - uses: actions/upload-artifact@v3 if: ${{ matrix.os == 'ubuntu-20.04' }} with: diff --git a/Dockerfilei386 b/Dockerfilei386 deleted file mode 100644 index 1063ec0b..00000000 --- a/Dockerfilei386 +++ /dev/null @@ -1,24 +0,0 @@ -# -# This dockerfile is used to build the 32bit linux binary -# -FROM i386/python:3.12-bullseye - -RUN apt-get update - -RUN python3 -m pip install --upgrade pip - -# Install this before PyInstaller -RUN python3 -m pip install setuptools - -# Test and build dependencies -RUN python3 -m pip install pyinstaller pytest - -RUN mkdir /app -WORKDIR /app -COPY . ./ - -# Install this project dependencies -RUN python3 -m pip install -e . - -ENV LC_ALL=C.UTF-8 -ENV LANG=C.UTF-8 diff --git a/binaries.py b/binaries.py index 7b43b069..0b817f63 100644 --- a/binaries.py +++ b/binaries.py @@ -42,10 +42,6 @@ def python(self): # up the current working directory. LINUX: OrderedDict([ (64, "python3"), - (32, - f"docker run --platform linux/386 -t " - f"-v {os.getcwd()}:/app 32-bit-linux " - f"python3"), ]), MACOS: { @@ -76,13 +72,6 @@ def install(self): """ Install required dependencies """ - # special case: - # - build the 32 bit binary for linux on docker - # - create dist/ path to circumvent permission errors - if self.os == self.LINUX: - self.run("docker build --platform linux/386 " - "-t 32-bit-linux -f Dockerfilei386 .") - for arch, python in self.python: self.run(f"{python} -m pip install pyinstaller") self.run(f"{python} -m pip install -r test_requirements.txt") @@ -105,7 +94,7 @@ def dist(self): artifact_path = os.path.join( os.getcwd(), "dist", - f"safety-{self.os}-{'i386' if arch == 32 else 'x86_64'}" + f"safety-{self.os}-{'i686' if arch == 32 else 'x86_64'}" ) binary_path = os.path.join(os.getcwd(), build_path, "safety") if self.os == self.WIN: