OneDev: remove docker-clean file preventing caching

ecere · Mar 30, 2023 · 1625a0f · 1625a0f
1 parent 2240ed1
commit 1625a0f
Showing 1 changed file with 35 additions and 46 deletions.
diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml
@@ -1,4 +1,4 @@
-version: 18
+version: 20
 jobs:
 - name: Build
   steps:
@@ -14,6 +14,7 @@ jobs:
     image: ubuntu:18.04
     interpreter: !DefaultInterpreter
       commands:
+      - rm /etc/apt/apt.conf.d/docker-clean
       - echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/98keep-debs
       - echo 'APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/99keep-debs
       - dpkg --add-architecture i386
@@ -44,7 +45,6 @@ jobs:
       - apt -y install zlib1g-dev:i386
       - apt -y install libpng-dev:i386
       - apt -y install libjpeg62-dev:i386
-#      - apt -y install libgif-dev:i386
       - apt -y install libncurses5-dev:i386
       - apt -y install libfreetype6-dev:i386
       - apt -y install libx11-dev:i386
@@ -61,45 +61,36 @@ jobs:
       - apt -y install git
       - apt -y install python3-pip
       - pip3 install cffi
-      - make -j2 && mkdir output && make install DESTDIR=output &&
-        rm /usr/bin/gcc &&
-        rm /usr/bin/g++ &&
-        ln -s /usr/bin/gcc-8 /usr/bin/gcc &&
-        ln -s /usr/bin/g++-8 /usr/bin/g++ &&
-        make bindings &&
-        rm /usr/bin/gcc &&
-        rm /usr/bin/g++ &&
-        ln -s /usr/bin/gcc-7 /usr/bin/gcc &&
-        ln -s /usr/bin/g++-7 /usr/bin/g++ &&
-        apt -y install libgif-dev:i386 &&
-        make ARCH=x32 -j2 && make ARCH=x32 install DESTDIR=output &&
-        tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected] extras butterbur/src compiler/eccss ecere/src ide/src/designer/SyntaxHighlighting.ec ide/src/designer/SyntaxColorScheme.ec ide/res/actions default.cf crossplatform.mk &&
-        cd output && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected] * && cd .. &&
-        cd obj &&
-        tar czf @project_name@-@tag@-@branch@-@commit_hash@-@build_number@-binaries-linux-x86_64.tar.gz linux &&
-        tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected] linux.x32 &&
-        cd .. &&
-        tar czf @project_name@-@tag@-@branch@-@commit_hash@-@build_number@-bindings-linux-x86_64.tar.gz bindings &&
-        wget https://ecere.com/tmp/win32-patches.tar.gz &&
-        tar xf win32-patches.tar.gz &&
-        ln -s $(pwd)/win32/regex/regex.h /usr/x86_64-w64-mingw32/include/ &&
-        ln -s $(pwd)/win32/regex/gnurx-0.dll /usr/x86_64-w64-mingw32/lib/ &&
-        ln -s $(pwd)/win32/regex/regex.h /usr/i686-w64-mingw32/include/ &&
-        ln -s $(pwd)/win32/regex-x32/libgnurx-0.dll /usr/i686-w64-mingw32/lib/ &&
-        apt -y install libgif-dev &&
-        make PLATFORM=win32 OPENSSL_CONF=$(pwd)/win32/openssl/bin/openssl.cfg &&
-        mkdir output-win32 &&
-        make PLATFORM=win32 OPENSSL_CONF=$(pwd)/win32/openssl/bin/openssl.cfg DESTDIR=output-win32 install &&
-        cd output-win32 && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@build_number@-output-windows-x86_64.tar.gz * && cd .. &&
-        apt -y install libgif-dev:i386 &&
-        make PLATFORM=win32 ARCH=x32 OPENSSL_CONF=$(pwd)/win32/openssl-x32/bin/openssl.cfg &&
-        mkdir output-win32-x32 && make PLATFORM=win32 ARCH=x32 OPENSSL_CONF=$(pwd)/win32/openssl-x32/bin/openssl.cfg DESTDIR=output-win32-x32 install &&
-        cd output-win32-x32 && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected] * && cd .. &&
-        make PLATFORM=win32 ARCH=x32 OPENSSL_CONF=$(pwd)/win32/openssl-x32/bin/openssl.cfg installer &&
-        tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected] deps &&
-        cd obj && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@build_number@-binaries-windows-x86_64.tar.gz win32 &&
-        tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected] win32.x32 && cd .. &&
-        cp installer/obj/release.win32.x32/setup-ecere-0.44.16pre-win32.exe @project_name@-@tag@-@branch@-@commit_hash@-@[email protected]
+      - make -j2 && mkdir output && make install DESTDIR=output && rm /usr/bin/gcc
+        && rm /usr/bin/g++ && ln -s /usr/bin/gcc-8 /usr/bin/gcc && ln -s /usr/bin/g++-8
+        /usr/bin/g++ && make bindings && rm /usr/bin/gcc && rm /usr/bin/g++ && ln
+        -s /usr/bin/gcc-7 /usr/bin/gcc && ln -s /usr/bin/g++-7 /usr/bin/g++ && apt
+        -y install libgif-dev:i386 && make ARCH=x32 -j2 && make ARCH=x32 install DESTDIR=output
+        && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected]
+        extras butterbur/src compiler/eccss ecere/src ide/src/designer/SyntaxHighlighting.ec
+        ide/src/designer/SyntaxColorScheme.ec ide/res/actions default.cf crossplatform.mk
+        && cd output && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected]
+        * && cd .. && cd obj && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@build_number@-binaries-linux-x86_64.tar.gz
+        linux && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected]
+        linux.x32 && cd .. && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@build_number@-bindings-linux-x86_64.tar.gz
+        bindings && wget https://ecere.com/tmp/win32-patches.tar.gz && tar xf win32-patches.tar.gz
+        && ln -s $(pwd)/win32/regex/regex.h /usr/x86_64-w64-mingw32/include/ && ln
+        -s $(pwd)/win32/regex/gnurx-0.dll /usr/x86_64-w64-mingw32/lib/ && ln -s $(pwd)/win32/regex/regex.h
+        /usr/i686-w64-mingw32/include/ && ln -s $(pwd)/win32/regex-x32/libgnurx-0.dll
+        /usr/i686-w64-mingw32/lib/ && apt -y install libgif-dev && make PLATFORM=win32
+        OPENSSL_CONF=$(pwd)/win32/openssl/bin/openssl.cfg && mkdir output-win32 &&
+        make PLATFORM=win32 OPENSSL_CONF=$(pwd)/win32/openssl/bin/openssl.cfg DESTDIR=output-win32
+        install && cd output-win32 && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@build_number@-output-windows-x86_64.tar.gz
+        * && cd .. && apt -y install libgif-dev:i386 && make PLATFORM=win32 ARCH=x32
+        OPENSSL_CONF=$(pwd)/win32/openssl-x32/bin/openssl.cfg && mkdir output-win32-x32
+        && make PLATFORM=win32 ARCH=x32 OPENSSL_CONF=$(pwd)/win32/openssl-x32/bin/openssl.cfg
+        DESTDIR=output-win32-x32 install && cd output-win32-x32 && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected]
+        * && cd .. && make PLATFORM=win32 ARCH=x32 OPENSSL_CONF=$(pwd)/win32/openssl-x32/bin/openssl.cfg
+        installer && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected]
+        deps && cd obj && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@build_number@-binaries-windows-x86_64.tar.gz
+        win32 && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected]
+        win32.x32 && cd .. && cp installer/obj/release.win32.x32/setup-ecere-0.44.16pre-win32.exe
+        @project_name@-@tag@-@branch@-@commit_hash@-@[email protected]
     useTTY: true
     condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
   - !PublishArtifactStep
@@ -165,13 +156,11 @@ jobs:
   retryCondition: never
   maxRetries: 3
   retryDelay: 30
-  cpuRequirement: 250
-  memoryRequirement: 256
   caches:
-  - key: '@project_name@AptCache'
+  - key: AptCache
     path: /var/cache/apt
-  - key: '@project_name@AptList'
+  - key: AptList
     path: /var/lib/apt/lists
-  - key: '@project_name@pip'
+  - key: pip
     path: /root/.cache/pip
   timeout: 3600