Remove gcc4 / gcc5 from nightly builds (#6659)

openframeworks · Jan 13, 2021 · 6ca04be · 6ca04be
1 parent ea4c2c3
commit 6ca04be
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
         matrix:
           cfg:
-          - {target: linux64, libs: 64gcc4}
+          - {target: linux64, libs: 64gcc6}
           - {target: linuxarmv6l, libs: armv6l}
           - {target: linuxarmv7l, libs: armv7l}
     env:
@@ -26,15 +26,15 @@ jobs:
       run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}};
     - name: Install dependencies
       run: ./scripts/ci/$TARGET/install.sh;
-    - name: Install gcc4
-      run: if [ ${{matrix.cfg.target}} = "64gcc4" ]; then
-                sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;
-                sudo apt-get update -q;
-                sudo apt-get install gcc-4.9 g++-4.9;
-            fi
+#    - name: Install gcc4
+#      run: if [ ${{matrix.cfg.target}} = "64gcc4" ]; then
+#                sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;
+#                sudo apt-get update -q;
+#                sudo apt-get install gcc-4.9 g++-4.9;
+#            fi
     - name: Build
       run: if [ "$TARGET" = "linux64" ]; then
-            scripts/ci/$TARGET/build.sh
+            scripts/ci/$TARGET/build.sh;
             scripts/ci/$TARGET/run_tests.sh;
            else
             scripts/ci/$TARGET/build.sh;

diff --git a/scripts/ci/linux64/install.sh b/scripts/ci/linux64/install.sh
@@ -17,8 +17,10 @@ fi
 
 sudo $OF_ROOT/scripts/linux/ubuntu/install_dependencies.sh -y;
 
-sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-sudo apt-get install gcc-4.9 g++-4.9
+#sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+#sudo apt-get install gcc-4.9 g++-4.9
+
+g++ -v
 
 if [ "$OPT" = "qbs" ] && [ ! -d "$TRAVIS_BUILD_DIR/linuxbrew/.linuxbrew" ]; then
     sh -c "$(curl -fsSL https://raw.githubusercontent.com/Linuxbrew/install/master/install.sh)"

diff --git a/scripts/dev/nightlybuilds.sh b/scripts/dev/nightlybuilds.sh
@@ -49,8 +49,8 @@ if [ "$currenthash" = "$lasthash" ]; then
     exit 0
 fi
 
-./create_package.sh linux64 $lastversion master gcc4
-./create_package.sh linux64 $lastversion master gcc5
+#./create_package.sh linux64 $lastversion master gcc4
+#./create_package.sh linux64 $lastversion master gcc5
 ./create_package.sh linux64 $lastversion master gcc6
 ./create_package.sh msys2 $lastversion master mingw32
 ./create_package.sh msys2 $lastversion master mingw64
@@ -67,8 +67,8 @@ rm -f /var/www/versions/nightly/of_v*_nightly.*
 mv *.tar.gz /var/www/versions/nightly
 mv *.zip /var/www/versions/nightly
 
-mv /var/www/versions/nightly/of_v${lastversion}_linux64gcc4_release.tar.gz /var/www/versions/nightly/of_v${lastversion}_linux64gcc4_nightly.tar.gz
-mv /var/www/versions/nightly/of_v${lastversion}_linux64gcc5_release.tar.gz /var/www/versions/nightly/of_v${lastversion}_linux64gcc5_nightly.tar.gz
+#mv /var/www/versions/nightly/of_v${lastversion}_linux64gcc4_release.tar.gz /var/www/versions/nightly/of_v${lastversion}_linux64gcc4_nightly.tar.gz
+#mv /var/www/versions/nightly/of_v${lastversion}_linux64gcc5_release.tar.gz /var/www/versions/nightly/of_v${lastversion}_linux64gcc5_nightly.tar.gz
 mv /var/www/versions/nightly/of_v${lastversion}_linux64gcc6_release.tar.gz /var/www/versions/nightly/of_v${lastversion}_linux64gcc6_nightly.tar.gz
 mv /var/www/versions/nightly/of_v${lastversion}_msys2_mingw32_release.zip /var/www/versions/nightly/of_v${lastversion}_msys2_mingw32_nightly.zip
 mv /var/www/versions/nightly/of_v${lastversion}_msys2_mingw64_release.zip /var/www/versions/nightly/of_v${lastversion}_msys2_mingw64_nightly.zip

diff --git a/scripts/dev/release.sh b/scripts/dev/release.sh
@@ -51,8 +51,8 @@ git commit scripts/apothecary apps/projectGenerator -m"update submodules to late
 
 cd $(cat ~/.ofprojectgenerator/config)/scripts/dev
 
-./create_package.sh linux64 $version $branch gcc4
-./create_package.sh linux64 $version $branch gcc5
+#./create_package.sh linux64 $version $branch gcc4
+#./create_package.sh linux64 $version $branch gcc5
 ./create_package.sh linux64 $version $branch gcc6
 ./create_package.sh linuxarmv6l $version $branch
 ./create_package.sh linuxarmv7l $version $branch