From 9a27132ad93433c9675b360d30e50d69e87e42a9 Mon Sep 17 00:00:00 2001
From: Trihedraf <forrest@mailfsh.com>
Date: Mon, 3 May 2021 02:54:05 -0700
Subject: [PATCH] Move Linux x64 back to circleci and debian:stretch-backports

---
 .circleci/config.yml               | 18 ++++++++++
 .github/workflows/Linux_x86_64.yml | 58 ------------------------------
 2 files changed, 18 insertions(+), 58 deletions(-)
 delete mode 100644 .github/workflows/Linux_x86_64.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0fa32f34d..46e52c87d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,5 +1,22 @@
 version: 2
 jobs:
+  linux_x86_64:
+    docker:
+      - image: debian:stretch-backports
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - run: echo deb http://deb.debian.org/debian stretch-backports-sloppy main >> /etc/apt/sources.list.d/debian-backports.list
+      - run: apt update -y
+      - run: apt install -y g++ libsdl2-dev libsdl2-ttf-dev git rpm wget
+      - run: apt install -y -t 'stretch-backports*' cmake libsodium-dev
+      - run: cmake -S. -Bbuild .. -DNIGHTLY_BUILD=ON -DCMAKE_INSTALL_PREFIX=/usr
+      - run: cmake --build build -j 2 --target package
+      - store_artifacts: {path: ./build/devilutionx, destination: devilutionx_linux_x86_64}
+      - run: Packaging/nix/LinuxReleasePackaging.sh
+      - run: Packaging/nix/AppImage.sh
+      - store_artifacts: {path: ./devilutionx.appimage, destination: devilutionx_linux_x86_64.appimage}
+      - store_artifacts: {path: ./devilutionx.tar.xz, destination: devilutionx_linux_x86_64.tar.xz}
   linux_x86_64_test:
     docker:
       - image: debian:testing
@@ -76,6 +93,7 @@ workflows:
   version: 2
   testflow:
     jobs:
+      - linux_x86_64
       - linux_x86_64_test
       - switch
       - 3ds
diff --git a/.github/workflows/Linux_x86_64.yml b/.github/workflows/Linux_x86_64.yml
deleted file mode 100644
index 9d92f758e..000000000
--- a/.github/workflows/Linux_x86_64.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-name: Linux_x86_64
-
-on: [push, pull_request]
-
-jobs:
-  prebuild:
-    runs-on: ubuntu-latest
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@master
-        
-  build:
-    needs: prebuild
-    if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
-    runs-on: ubuntu-20.04
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-
-    - name: Create Build Environment
-      run: >
-        sudo apt update &&
-        sudo apt install -y cmake file g++ git libfmt-dev libsdl2-dev libsdl2-ttf-dev libsodium-dev rpm wget
-
-    - name: Configure CMake
-      shell: bash
-      working-directory: ${{github.workspace}}
-      run: cmake -S. -Bbuild .. -DNIGHTLY_BUILD=ON -DCMAKE_INSTALL_PREFIX=/usr
-
-    - name: Build
-      working-directory: ${{github.workspace}}
-      shell: bash
-      run: cmake --build build -j $(nproc) --target package
-
-    - name: Upload-Executable
-      uses: actions/upload-artifact@v2
-      with:
-        name: devilutionx_linux_x86_64
-        path: build/devilutionx
-
-    - name: Package
-      run: Packaging/nix/LinuxReleasePackaging.sh && Packaging/nix/AppImage.sh
-
-    - name: Upload-Package
-      uses: actions/upload-artifact@v2
-      with:
-        name: devilutionx_linux_x86_64.tar.xz
-        path: devilutionx.tar.xz
-
-    - name: Upload-AppImage
-      uses: actions/upload-artifact@v2
-      with:
-        name: devilutionx_linux_x86_64.appimage
-        path: devilutionx.appimage