From 9a8ed301f044f04465cbcb7357a34906b25ba102 Mon Sep 17 00:00:00 2001 From: Kyle Bloom Date: Thu, 16 Nov 2023 18:17:29 +0000 Subject: [PATCH 1/9] Remove old OS's --- synergy-core/fedora/33/Dockerfile | 26 ------------------- synergy-core/fedora/34/Dockerfile | 26 ------------------- synergy-core/fedora/35/Dockerfile | 27 -------------------- synergy-core/ubuntu/16.04/Dockerfile | 38 ---------------------------- synergy-core/ubuntu/22.10/Dockerfile | 32 ----------------------- 5 files changed, 149 deletions(-) delete mode 100644 synergy-core/fedora/33/Dockerfile delete mode 100644 synergy-core/fedora/34/Dockerfile delete mode 100644 synergy-core/fedora/35/Dockerfile delete mode 100644 synergy-core/ubuntu/16.04/Dockerfile delete mode 100644 synergy-core/ubuntu/22.10/Dockerfile diff --git a/synergy-core/fedora/33/Dockerfile b/synergy-core/fedora/33/Dockerfile deleted file mode 100644 index d9acf63..0000000 --- a/synergy-core/fedora/33/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM fedora:33 - -# Update base packages -RUN dnf -y update \ - # Install Synergy core build dependencies - && dnf -y install \ - avahi-compat-libdns_sd \ - avahi-compat-libdns_sd-devel \ - cmake3 \ - gdk-pixbuf2-devel \ - git \ - glib2-devel \ - gpg \ - libcurl-devel \ - libnotify-devel \ - libxkbfile-devel \ - libXtst-devel \ - make \ - openssl-devel \ - qt5-qtbase-devel \ - qt5-qtdeclarative-devel \ - qt5-qttools-devel \ - rpm-build \ - rpmlint \ - && rm -rf /var/cache/yum \ - && git config --system --add safe.directory '*' diff --git a/synergy-core/fedora/34/Dockerfile b/synergy-core/fedora/34/Dockerfile deleted file mode 100644 index 24c56c2..0000000 --- a/synergy-core/fedora/34/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM fedora:34 - -# Update base packages -RUN dnf -y update \ - # Install Synergy core build dependencies - && dnf -y install \ - avahi-compat-libdns_sd \ - avahi-compat-libdns_sd-devel \ - cmake3 \ - gdk-pixbuf2-devel \ - git \ - glib2-devel \ - gpg \ - libcurl-devel \ - libnotify-devel \ - libxkbfile-devel \ - libXtst-devel \ - make \ - openssl-devel \ - qt5-qtbase-devel \ - qt5-qtdeclarative-devel \ - qt5-qttools-devel \ - rpm-build \ - rpmlint \ - && rm -rf /var/cache/yum \ - && git config --system --add safe.directory '*' diff --git a/synergy-core/fedora/35/Dockerfile b/synergy-core/fedora/35/Dockerfile deleted file mode 100644 index c57f814..0000000 --- a/synergy-core/fedora/35/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -FROM fedora:35 - -# Update base packages -RUN dnf -y update \ - # Install Synergy core build dependencies - && dnf -y install \ - avahi-compat-libdns_sd \ - avahi-compat-libdns_sd-devel \ - cmake3 \ - desktop-file-utils \ - gdk-pixbuf2-devel \ - git \ - glib2-devel \ - gpg \ - libcurl-devel \ - libnotify-devel \ - libxkbfile-devel \ - libXtst-devel \ - make \ - openssl-devel \ - qt5-qtbase-devel \ - qt5-qtdeclarative-devel \ - qt5-qttools-devel \ - rpm-build \ - rpmlint \ - && rm -rf /var/cache/yum \ - && git config --system --add safe.directory '*' diff --git a/synergy-core/ubuntu/16.04/Dockerfile b/synergy-core/ubuntu/16.04/Dockerfile deleted file mode 100644 index 0229a34..0000000 --- a/synergy-core/ubuntu/16.04/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -FROM ubuntu:16.04 - -# Update base packages -RUN export DEBIAN_FRONTEND=noninteractive \ - && apt-get update \ - && apt-get upgrade -y \ - # Setup git repository - && apt-get install software-properties-common -y \ - && apt-add-repository ppa:git-core/ppa \ - && apt-get update \ - # Install Synergy core build dependencies - && apt-get install -y \ - build-essential \ - curl \ - debhelper \ - devscripts \ - git \ - libavahi-compat-libdnssd-dev \ - libgdk-pixbuf2.0-dev \ - libgl1-mesa-dev \ - libglib2.0-dev \ - libnotify-dev \ - libssl-dev \ - libx11-dev \ - libxkbfile-dev \ - libxtst-dev \ - qtbase5-dev \ - qttools5-dev \ - qttools5-dev-tools \ - zip \ - && rm -rf /var/lib/apt/lists \ - && git config --system --add safe.directory '*' \ - # Install cmake 3.17.2 - && curl -sL -o /tmp/cmake-install.sh \ - https://github.com/Kitware/CMake/releases/download/v3.17.2/cmake-3.17.2-Linux-x86_64.sh \ - && chmod u+x /tmp/cmake-install.sh \ - && /tmp/cmake-install.sh --skip-license --prefix=/usr \ - && rm /tmp/cmake-install.sh diff --git a/synergy-core/ubuntu/22.10/Dockerfile b/synergy-core/ubuntu/22.10/Dockerfile deleted file mode 100644 index eea1bda..0000000 --- a/synergy-core/ubuntu/22.10/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -FROM ubuntu:22.10 - -# Update base packages -RUN export DEBIAN_FRONTEND=noninteractive \ - && apt-get update \ - && apt-get upgrade -y \ - # Setup git repository - && apt-get install software-properties-common -y \ - && apt-add-repository ppa:git-core/ppa \ - && apt-get update \ - # Install Synergy core build dependencies - && apt-get install -y \ - build-essential \ - cmake \ - debhelper \ - devscripts \ - git \ - libavahi-compat-libdnssd-dev \ - libgdk-pixbuf2.0-dev \ - libgl1-mesa-dev \ - libglib2.0-dev \ - libnotify-dev \ - libssl-dev \ - libx11-dev \ - libxkbfile-dev \ - libxtst-dev \ - qtbase5-dev \ - qttools5-dev \ - qttools5-dev-tools \ - zip \ - && rm -rf /var/lib/apt/lists \ - && git config --system --add safe.directory '*' From 71aaa7b6762743d385d929819095ce2896e1fa4a Mon Sep 17 00:00:00 2001 From: Kyle Bloom Date: Thu, 16 Nov 2023 18:17:53 +0000 Subject: [PATCH 2/9] Rename testing scripts --- build-core.sh => build-core | 8 ++++---- make-core.sh => make-core | 8 ++++---- test-core.sh => test-core | 12 ++++++------ test-core-all.sh => test-core-all | 16 ++++++++-------- 4 files changed, 22 insertions(+), 22 deletions(-) rename build-core.sh => build-core (88%) rename make-core.sh => make-core (94%) rename test-core.sh => test-core (78%) rename test-core-all.sh => test-core-all (71%) diff --git a/build-core.sh b/build-core similarity index 88% rename from build-core.sh rename to build-core index 4f8d69b..f09114a 100755 --- a/build-core.sh +++ b/build-core @@ -26,20 +26,20 @@ while getopts "h" flag; do esac done -OS="${@:$OPTIND:1}" -VERSION=${@:$OPTIND+1:1} +OS="${*:$OPTIND:1}" +VERSION=${*:$OPTIND+1:1} echo -e " ARGUMENTS: OS: $OS VERSION: $VERSION " -if [ -z $OS ]; then +if [ -z "$OS" ]; then echo "The OS parameter is required!" usage fi -if [ -z $VERSION ]; then +if [ -z "$VERSION" ]; then echo "The VERSION parameter is required!" usage fi diff --git a/make-core.sh b/make-core similarity index 94% rename from make-core.sh rename to make-core index c5f3bdf..e9d94a6 100755 --- a/make-core.sh +++ b/make-core @@ -42,8 +42,8 @@ while getopts "hj:b:" flag; do esac done -OS="${@:$OPTIND:1}" -VERSION=${@:$OPTIND+1:1} +OS="${*:$OPTIND:1}" +VERSION=${*:$OPTIND+1:1} echo -e " ARGUMENTS: @@ -54,12 +54,12 @@ OPTIONS: JOBS: $JOBS BRANCH: $BRANCH " -if [ -z $OS ]; then +if [ -z "$OS" ]; then echo "The OS parameter is required!" usage fi -if [ -z $VERSION ]; then +if [ -z "$VERSION" ]; then echo "The VERSION parameter is required!" usage fi diff --git a/test-core.sh b/test-core similarity index 78% rename from test-core.sh rename to test-core index 3078f35..d04e756 100755 --- a/test-core.sh +++ b/test-core @@ -34,8 +34,8 @@ while getopts "hj:b:" flag; do esac done -OS="${@:$OPTIND:1}" -VERSION=${@:$OPTIND+1:1} +OS="${*:$OPTIND:1}" +VERSION=${*:$OPTIND+1:1} echo -e " ARGUMENTS: @@ -46,12 +46,12 @@ OPTIONS: JOBS: $JOBS BRANCH: $BRANCH " -if [ -z $OS ]; then +if [ -z "$OS" ]; then echo "The OS parameter is required!" usage fi -if [ -z $VERSION ]; then +if [ -z "$VERSION" ]; then echo "The VERSION parameter is required!" usage fi @@ -64,5 +64,5 @@ trap 'echo "\"${BASH_COMMAND}\" command filed with exit code $?."' DEBUG mkdir -p output -./build-core.sh "$OS" "$VERSION" |& tee "./output/synergy-core-$OS$VERSION.txt" -./make-core.sh -j "$JOBS" -b "$BRANCH" "$OS" "$VERSION" |& tee -a "./output/synergy-core-$OS$VERSION.txt" +./build-core "$OS" "$VERSION" |& tee "./output/synergy-core-$OS-$VERSION.txt" +./make-core -j "$JOBS" -b "$BRANCH" "$OS" "$VERSION" |& tee -a "./output/synergy-core-$OS-$VERSION.txt" diff --git a/test-core-all.sh b/test-core-all similarity index 71% rename from test-core-all.sh rename to test-core-all index b87cd1b..dc7ccaf 100755 --- a/test-core-all.sh +++ b/test-core-all @@ -1,6 +1,7 @@ #! /usr/bin/env bash JOBS="1" +TESTS="1" BRANCH="master" FILTER="" @@ -27,18 +28,21 @@ OPTIONS: exit 1 } -while getopts "hj:b:" flag; do +while getopts "hj:b:J:" flag; do case "$flag" in j) JOBS=$OPTARG;; + J) TESTS=$OPTARG;; b) BRANCH=$OPTARG;; *) usage;; esac done -FILTER=${@:$OPTIND} +FILTER=${*:$OPTIND} echo -e " ARGUMENTS: + TESTS: $TESTS + JOBS: $JOBS FILTER: $FILTER OPTIONS: @@ -50,13 +54,9 @@ docker container prune -f function args_pairs() { for os in "$1"/*; do for version in "$os"/*; do - if [ "ubuntu 16.04" = "$(basename "$os") $(basename "$version")" ]; then - echo "-j 1 $(basename "$os") $(basename "$version")" - else - echo "-j $JOBS $(basename "$os") $(basename "$version")" - fi + echo "-j $JOBS $(basename "$os") $(basename "$version")" done done } -args_pairs "./synergy-core" | grep "$FILTER" | xargs -L1 ./test-core.sh -b "$BRANCH" +args_pairs "./synergy-core" | grep "$FILTER" | xargs -L1 -P "$TESTS" ./test-core -b "$BRANCH" From 3d327309ccb3d6b53c38a031472f27f1a494636a Mon Sep 17 00:00:00 2001 From: Kyle Bloom Date: Mon, 27 Nov 2023 11:15:06 +0000 Subject: [PATCH 3/9] Add future testing OS's --- synergy-core/fedora/rawhide/Dockerfile | 27 ++++++++++++++++++++++ synergy-core/ubuntu/rolling/Dockerfile | 32 ++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 synergy-core/fedora/rawhide/Dockerfile create mode 100644 synergy-core/ubuntu/rolling/Dockerfile diff --git a/synergy-core/fedora/rawhide/Dockerfile b/synergy-core/fedora/rawhide/Dockerfile new file mode 100644 index 0000000..52b15c5 --- /dev/null +++ b/synergy-core/fedora/rawhide/Dockerfile @@ -0,0 +1,27 @@ +FROM fedora:rawhide + +# Update base packages +RUN dnf -y update \ + # Install Synergy core build dependencies + && dnf -y install \ + avahi-compat-libdns_sd \ + avahi-compat-libdns_sd-devel \ + cmake3 \ + desktop-file-utils \ + gdk-pixbuf2-devel \ + git \ + glib2-devel \ + gpg \ + libcurl-devel \ + libnotify-devel \ + libxkbfile-devel \ + libXtst-devel \ + make \ + openssl-devel \ + qt5-qtbase-devel \ + qt5-qtdeclarative-devel \ + qt5-qttools-devel \ + rpm-build \ + rpmlint \ + && rm -rf /var/cache/yum \ + && git config --system --add safe.directory '*' diff --git a/synergy-core/ubuntu/rolling/Dockerfile b/synergy-core/ubuntu/rolling/Dockerfile new file mode 100644 index 0000000..6cae966 --- /dev/null +++ b/synergy-core/ubuntu/rolling/Dockerfile @@ -0,0 +1,32 @@ +FROM ubuntu:rolling + +# Update base packages +RUN export DEBIAN_FRONTEND=noninteractive \ + && apt-get update \ + && apt-get upgrade -y \ + # Setup git repository + && apt-get install software-properties-common -y \ + && apt-add-repository ppa:git-core/ppa \ + && apt-get update \ + # Install Synergy core build dependencies + && apt-get install -y \ + build-essential \ + cmake \ + debhelper \ + devscripts \ + git \ + libavahi-compat-libdnssd-dev \ + libgdk-pixbuf2.0-dev \ + libgl1-mesa-dev \ + libglib2.0-dev \ + libnotify-dev \ + libssl-dev \ + libx11-dev \ + libxkbfile-dev \ + libxtst-dev \ + qtbase5-dev \ + qttools5-dev \ + qttools5-dev-tools \ + zip \ + && rm -rf /var/lib/apt/lists \ + && git config --system --add safe.directory '*' From 6722375957233979b843f21819b289c2385222e7 Mon Sep 17 00:00:00 2001 From: Kyle Bloom Date: Mon, 27 Nov 2023 11:15:21 +0000 Subject: [PATCH 4/9] Add new OS targets --- synergy-core/debian/12/Dockerfile | 28 ++++++++++++++++++++++++++++ synergy-core/fedora/39/Dockerfile | 27 +++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 synergy-core/debian/12/Dockerfile create mode 100644 synergy-core/fedora/39/Dockerfile diff --git a/synergy-core/debian/12/Dockerfile b/synergy-core/debian/12/Dockerfile new file mode 100644 index 0000000..c90e4dc --- /dev/null +++ b/synergy-core/debian/12/Dockerfile @@ -0,0 +1,28 @@ +FROM debian:12 + +# Update base packages +RUN export DEBIAN_FRONTEND=noninteractive \ + && apt-get update \ + && apt-get upgrade -y \ + # Install Synergy core build dependencies + && apt-get install -y \ + build-essential \ + cmake \ + debhelper \ + devscripts \ + git \ + libavahi-compat-libdnssd-dev \ + libgdk-pixbuf2.0-dev \ + libgl1-mesa-dev \ + libglib2.0-dev \ + libnotify-dev \ + libssl-dev \ + libx11-dev \ + libxkbfile-dev \ + libxtst-dev \ + qtbase5-dev \ + qttools5-dev \ + qttools5-dev-tools \ + zip \ + && rm -rf /var/lib/apt/lists \ + && git config --system --add safe.directory '*' diff --git a/synergy-core/fedora/39/Dockerfile b/synergy-core/fedora/39/Dockerfile new file mode 100644 index 0000000..ad7950a --- /dev/null +++ b/synergy-core/fedora/39/Dockerfile @@ -0,0 +1,27 @@ +FROM fedora:39 + +# Update base packages +RUN dnf -y update \ + # Install Synergy core build dependencies + && dnf -y install \ + avahi-compat-libdns_sd \ + avahi-compat-libdns_sd-devel \ + cmake3 \ + desktop-file-utils \ + gdk-pixbuf2-devel \ + git \ + glib2-devel \ + gpg \ + libcurl-devel \ + libnotify-devel \ + libxkbfile-devel \ + libXtst-devel \ + make \ + openssl-devel \ + qt5-qtbase-devel \ + qt5-qtdeclarative-devel \ + qt5-qttools-devel \ + rpm-build \ + rpmlint \ + && rm -rf /var/cache/yum \ + && git config --system --add safe.directory '*' From 94b24a60451e40a58dd5d66c52e0f3f01a1bad5c Mon Sep 17 00:00:00 2001 From: Kyle Bloom Date: Mon, 27 Nov 2023 11:18:12 +0000 Subject: [PATCH 5/9] Revert "Remove old OS's" This reverts commit 9a8ed301f044f04465cbcb7357a34906b25ba102. --- synergy-core/fedora/33/Dockerfile | 26 +++++++++++++++++++ synergy-core/fedora/34/Dockerfile | 26 +++++++++++++++++++ synergy-core/fedora/35/Dockerfile | 27 ++++++++++++++++++++ synergy-core/ubuntu/16.04/Dockerfile | 38 ++++++++++++++++++++++++++++ synergy-core/ubuntu/22.10/Dockerfile | 32 +++++++++++++++++++++++ 5 files changed, 149 insertions(+) create mode 100644 synergy-core/fedora/33/Dockerfile create mode 100644 synergy-core/fedora/34/Dockerfile create mode 100644 synergy-core/fedora/35/Dockerfile create mode 100644 synergy-core/ubuntu/16.04/Dockerfile create mode 100644 synergy-core/ubuntu/22.10/Dockerfile diff --git a/synergy-core/fedora/33/Dockerfile b/synergy-core/fedora/33/Dockerfile new file mode 100644 index 0000000..d9acf63 --- /dev/null +++ b/synergy-core/fedora/33/Dockerfile @@ -0,0 +1,26 @@ +FROM fedora:33 + +# Update base packages +RUN dnf -y update \ + # Install Synergy core build dependencies + && dnf -y install \ + avahi-compat-libdns_sd \ + avahi-compat-libdns_sd-devel \ + cmake3 \ + gdk-pixbuf2-devel \ + git \ + glib2-devel \ + gpg \ + libcurl-devel \ + libnotify-devel \ + libxkbfile-devel \ + libXtst-devel \ + make \ + openssl-devel \ + qt5-qtbase-devel \ + qt5-qtdeclarative-devel \ + qt5-qttools-devel \ + rpm-build \ + rpmlint \ + && rm -rf /var/cache/yum \ + && git config --system --add safe.directory '*' diff --git a/synergy-core/fedora/34/Dockerfile b/synergy-core/fedora/34/Dockerfile new file mode 100644 index 0000000..24c56c2 --- /dev/null +++ b/synergy-core/fedora/34/Dockerfile @@ -0,0 +1,26 @@ +FROM fedora:34 + +# Update base packages +RUN dnf -y update \ + # Install Synergy core build dependencies + && dnf -y install \ + avahi-compat-libdns_sd \ + avahi-compat-libdns_sd-devel \ + cmake3 \ + gdk-pixbuf2-devel \ + git \ + glib2-devel \ + gpg \ + libcurl-devel \ + libnotify-devel \ + libxkbfile-devel \ + libXtst-devel \ + make \ + openssl-devel \ + qt5-qtbase-devel \ + qt5-qtdeclarative-devel \ + qt5-qttools-devel \ + rpm-build \ + rpmlint \ + && rm -rf /var/cache/yum \ + && git config --system --add safe.directory '*' diff --git a/synergy-core/fedora/35/Dockerfile b/synergy-core/fedora/35/Dockerfile new file mode 100644 index 0000000..c57f814 --- /dev/null +++ b/synergy-core/fedora/35/Dockerfile @@ -0,0 +1,27 @@ +FROM fedora:35 + +# Update base packages +RUN dnf -y update \ + # Install Synergy core build dependencies + && dnf -y install \ + avahi-compat-libdns_sd \ + avahi-compat-libdns_sd-devel \ + cmake3 \ + desktop-file-utils \ + gdk-pixbuf2-devel \ + git \ + glib2-devel \ + gpg \ + libcurl-devel \ + libnotify-devel \ + libxkbfile-devel \ + libXtst-devel \ + make \ + openssl-devel \ + qt5-qtbase-devel \ + qt5-qtdeclarative-devel \ + qt5-qttools-devel \ + rpm-build \ + rpmlint \ + && rm -rf /var/cache/yum \ + && git config --system --add safe.directory '*' diff --git a/synergy-core/ubuntu/16.04/Dockerfile b/synergy-core/ubuntu/16.04/Dockerfile new file mode 100644 index 0000000..0229a34 --- /dev/null +++ b/synergy-core/ubuntu/16.04/Dockerfile @@ -0,0 +1,38 @@ +FROM ubuntu:16.04 + +# Update base packages +RUN export DEBIAN_FRONTEND=noninteractive \ + && apt-get update \ + && apt-get upgrade -y \ + # Setup git repository + && apt-get install software-properties-common -y \ + && apt-add-repository ppa:git-core/ppa \ + && apt-get update \ + # Install Synergy core build dependencies + && apt-get install -y \ + build-essential \ + curl \ + debhelper \ + devscripts \ + git \ + libavahi-compat-libdnssd-dev \ + libgdk-pixbuf2.0-dev \ + libgl1-mesa-dev \ + libglib2.0-dev \ + libnotify-dev \ + libssl-dev \ + libx11-dev \ + libxkbfile-dev \ + libxtst-dev \ + qtbase5-dev \ + qttools5-dev \ + qttools5-dev-tools \ + zip \ + && rm -rf /var/lib/apt/lists \ + && git config --system --add safe.directory '*' \ + # Install cmake 3.17.2 + && curl -sL -o /tmp/cmake-install.sh \ + https://github.com/Kitware/CMake/releases/download/v3.17.2/cmake-3.17.2-Linux-x86_64.sh \ + && chmod u+x /tmp/cmake-install.sh \ + && /tmp/cmake-install.sh --skip-license --prefix=/usr \ + && rm /tmp/cmake-install.sh diff --git a/synergy-core/ubuntu/22.10/Dockerfile b/synergy-core/ubuntu/22.10/Dockerfile new file mode 100644 index 0000000..eea1bda --- /dev/null +++ b/synergy-core/ubuntu/22.10/Dockerfile @@ -0,0 +1,32 @@ +FROM ubuntu:22.10 + +# Update base packages +RUN export DEBIAN_FRONTEND=noninteractive \ + && apt-get update \ + && apt-get upgrade -y \ + # Setup git repository + && apt-get install software-properties-common -y \ + && apt-add-repository ppa:git-core/ppa \ + && apt-get update \ + # Install Synergy core build dependencies + && apt-get install -y \ + build-essential \ + cmake \ + debhelper \ + devscripts \ + git \ + libavahi-compat-libdnssd-dev \ + libgdk-pixbuf2.0-dev \ + libgl1-mesa-dev \ + libglib2.0-dev \ + libnotify-dev \ + libssl-dev \ + libx11-dev \ + libxkbfile-dev \ + libxtst-dev \ + qtbase5-dev \ + qttools5-dev \ + qttools5-dev-tools \ + zip \ + && rm -rf /var/lib/apt/lists \ + && git config --system --add safe.directory '*' From da16f7dbccfb71ba2187d78b9f34e2374c021f58 Mon Sep 17 00:00:00 2001 From: Kyle Bloom Date: Mon, 27 Nov 2023 11:18:45 +0000 Subject: [PATCH 6/9] Remove 22.10 --- synergy-core/ubuntu/22.10/Dockerfile | 32 ---------------------------- 1 file changed, 32 deletions(-) delete mode 100644 synergy-core/ubuntu/22.10/Dockerfile diff --git a/synergy-core/ubuntu/22.10/Dockerfile b/synergy-core/ubuntu/22.10/Dockerfile deleted file mode 100644 index eea1bda..0000000 --- a/synergy-core/ubuntu/22.10/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -FROM ubuntu:22.10 - -# Update base packages -RUN export DEBIAN_FRONTEND=noninteractive \ - && apt-get update \ - && apt-get upgrade -y \ - # Setup git repository - && apt-get install software-properties-common -y \ - && apt-add-repository ppa:git-core/ppa \ - && apt-get update \ - # Install Synergy core build dependencies - && apt-get install -y \ - build-essential \ - cmake \ - debhelper \ - devscripts \ - git \ - libavahi-compat-libdnssd-dev \ - libgdk-pixbuf2.0-dev \ - libgl1-mesa-dev \ - libglib2.0-dev \ - libnotify-dev \ - libssl-dev \ - libx11-dev \ - libxkbfile-dev \ - libxtst-dev \ - qtbase5-dev \ - qttools5-dev \ - qttools5-dev-tools \ - zip \ - && rm -rf /var/lib/apt/lists \ - && git config --system --add safe.directory '*' From 97294c5caee29fa607a12ab4eb19114f3c853bf0 Mon Sep 17 00:00:00 2001 From: Kyle Bloom Date: Mon, 27 Nov 2023 11:53:10 +0000 Subject: [PATCH 7/9] Rename build-core to build-container --- build-core => build-container | 0 test-core | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename build-core => build-container (100%) diff --git a/build-core b/build-container similarity index 100% rename from build-core rename to build-container diff --git a/test-core b/test-core index d04e756..c2024d5 100755 --- a/test-core +++ b/test-core @@ -64,5 +64,5 @@ trap 'echo "\"${BASH_COMMAND}\" command filed with exit code $?."' DEBUG mkdir -p output -./build-core "$OS" "$VERSION" |& tee "./output/synergy-core-$OS-$VERSION.txt" +./build-container "$OS" "$VERSION" |& tee "./output/synergy-core-$OS-$VERSION.txt" ./make-core -j "$JOBS" -b "$BRANCH" "$OS" "$VERSION" |& tee -a "./output/synergy-core-$OS-$VERSION.txt" From 935a9fb77eb56f496bad387cc692e208edd3abae Mon Sep 17 00:00:00 2001 From: Kyle Bloom Date: Mon, 27 Nov 2023 11:53:20 +0000 Subject: [PATCH 8/9] Add make file to make scripts easier to use --- Makefile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..18d59fd --- /dev/null +++ b/Makefile @@ -0,0 +1,16 @@ +ODIR = ./output +BRANCH = master +MAKE-PARALLEL = - +TEST-PARALLEL = 1 +FILTER = + +.PHONY: clean purge test-all + +clean: + rm -rf $(ODIR) + +rmi: + docker images | grep symless/synergy-core | tr -s ' ' | cut -d ' ' -f 2 | xargs -I {} docker rmi symless/synergy-core:{} + +test-all: + ./test-core-all $(FILTER) -j $(MAKE-PARALLEL) -b $(BRANCH) -J $(TEST-PARALLEL) From e25321aa22ca8a330670fdadf3219379c25d21fa Mon Sep 17 00:00:00 2001 From: Kyle Bloom Date: Wed, 29 Nov 2023 13:59:21 +0000 Subject: [PATCH 9/9] Minor change to make file --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 18d59fd..808c0bc 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ ODIR = ./output BRANCH = master -MAKE-PARALLEL = - -TEST-PARALLEL = 1 +JOBS = - +TESTS = 1 FILTER = .PHONY: clean purge test-all @@ -13,4 +13,4 @@ rmi: docker images | grep symless/synergy-core | tr -s ' ' | cut -d ' ' -f 2 | xargs -I {} docker rmi symless/synergy-core:{} test-all: - ./test-core-all $(FILTER) -j $(MAKE-PARALLEL) -b $(BRANCH) -J $(TEST-PARALLEL) + ./test-core-all $(FILTER) -j $(JOBS) -b $(BRANCH) -J $(TESTS)