Make main linux container Linux-docker-gcc-7-5-0

The runner for ubuntu 18 is being deprecated and the builds for it are automatically failing, ditch it in favour of the docker runner version that will build with the same toolchain
edo9300 · Mar 6, 2023 · 855c4e3 · 855c4e3
1 parent 55bb44f
commit 855c4e3
Showing 1 changed file with 50 additions and 50 deletions.
diff --git a/.github/workflows/edopro.yml b/.github/workflows/edopro.yml
@@ -160,61 +160,61 @@ jobs:
         # avatar_url: https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png
         # username: Github
 
-  Linux-gcc-7-5-0:
-    runs-on: ubuntu-18.04
-    env:
-      DEPLOY_BRANCH: travis-linux
-      TRAVIS_OS_NAME: linux
-      BUILD_CONFIG: release
-      ARCH: x64
-    steps:
-    - name: Set custom env vars
-      shell: bash
-      run: |
-        echo "VCPKG_ROOT=$PWD/vcpkg" >> $GITHUB_ENV
-        echo "VCPKG_CACHE_7Z_URL=$DEPENDENCIES_BASE_URL/installed_x64-linux.7z" >> $GITHUB_ENV
-    - name: Get apt packages
-      shell: bash
-      run: |
-        sudo apt remove libsqlite3-dev
-    - uses: actions/checkout@v1
-      with:
-        fetch-depth: 1
-    - name: Install premake
-      shell: bash
-      run: ./travis/install-premake5.sh
-    - name: Install dependencies
-      shell: bash
-      run: ./travis/dependencies.sh
-    - name: Build
-      shell: bash
-      run: ./travis/build.sh
-    - name: Predeploy
-      shell: bash
-      run: ./travis/predeploy.sh
-    - name: Deploy
-      if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
-      shell: bash
-      run: ./travis/deploy.sh
-    - name: Log Failure
-      uses: sarisia/actions-status-discord@v1
-      if: failure()
-      with:
-        nodetail: true
-        description: |
-            [[${{ github.event.repository.name }}] ${{ github.job }} failed on ${{ github.ref }}](https://github.com/${{github.repository}}/actions/runs/${{github.run_id}})
-        title: |
+  # Linux-gcc-7-5-0:
+    # runs-on: ubuntu-18.04
+    # env:
+      # DEPLOY_BRANCH: travis-linux
+      # TRAVIS_OS_NAME: linux
+      # BUILD_CONFIG: release
+      # ARCH: x64
+    # steps:
+    # - name: Set custom env vars
+      # shell: bash
+      # run: |
+        # echo "VCPKG_ROOT=$PWD/vcpkg" >> $GITHUB_ENV
+        # echo "VCPKG_CACHE_7Z_URL=$DEPENDENCIES_BASE_URL/installed_x64-linux.7z" >> $GITHUB_ENV
+    # - name: Get apt packages
+      # shell: bash
+      # run: |
+        # sudo apt remove libsqlite3-dev
+    # - uses: actions/checkout@v1
+      # with:
+        # fetch-depth: 1
+    # - name: Install premake
+      # shell: bash
+      # run: ./travis/install-premake5.sh
+    # - name: Install dependencies
+      # shell: bash
+      # run: ./travis/dependencies.sh
+    # - name: Build
+      # shell: bash
+      # run: ./travis/build.sh
+    # - name: Predeploy
+      # shell: bash
+      # run: ./travis/predeploy.sh
+    # - name: Deploy
+      # if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+      # shell: bash
+      # run: ./travis/deploy.sh
+    # - name: Log Failure
+      # uses: sarisia/actions-status-discord@v1
+      # if: failure()
+      # with:
+        # nodetail: true
+        # description: |
+            # [[${{ github.event.repository.name }}] ${{ github.job }} failed on ${{ github.ref }}](https://github.com/${{github.repository}}/actions/runs/${{github.run_id}})
+        # title: |
 
-        color: 0xff0000
-        webhook: ${{ secrets.DISCORD_WEBHOOK }}
-        avatar_url: https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png
-        username: Github
+        # color: 0xff0000
+        # webhook: ${{ secrets.DISCORD_WEBHOOK }}
+        # avatar_url: https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png
+        # username: Github
 
   Linux-docker-gcc-7-5-0:
     runs-on: ubuntu-latest
     container: ubuntu:18.04
     env:
-      DEPLOY_BRANCH: travis-linux-docker-gcc7
+      DEPLOY_BRANCH: travis-linux
       TRAVIS_OS_NAME: linux
       BUILD_CONFIG: release
       ARCH: x64
@@ -835,7 +835,7 @@ jobs:
 
   Notify-success:
     runs-on: ubuntu-latest
-    needs: [ Windows, Linux-gcc-7-5-0, Mac-os-universal-cctools ]
+    needs: [ Windows, Linux-docker-gcc-7-5-0, Mac-os-universal-cctools ]
     steps:
     - name: Log Success
       uses: sarisia/actions-status-discord@v1