Update checkdepends and CI

4 files changed, 23 insertions, 64 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2f544bdec7f3..b44f9ffcacaf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = gnudatalanguage
 	pkgdesc = An IDL (Interactive Data Language) compatible incremental compiler (ie. runs IDL programs)
 	pkgver = 1.0.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://gnudatalanguage.github.io/
 	arch = i686
 	arch = x86_64
 	license = GPL
+	checkdepends = openssh
 	makedepends = cmake
 	depends = eccodes
 	depends = eigen
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75110bd9c234..168cfb7e8603 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,80 +1,37 @@
 include:
-  - project: 'common/gitlab-helper'
+  - project: "common/gitlab-helper"
     ref: master
-    file: 'container-helper.yml'
-  - project: 'common/gitlab-helper'
-    ref: master
-    file: 'deploy-helper.yml'
-
-variables:
-  BUILD_AND_TEST_IMAGE: build_and_test
+    file: "ci-helper.yml"
 
-workflow:
-  rules:
-    # don't create pipeline if the commit message starts with WIP
-    - if: $CI_COMMIT_MESSAGE =~ /^WIP/
-      when: never
-    # don't create pipeline if we're merging from master or version branches
-    - if: $CI_MERGE_REQUEST_IID && $CI_COMMIT_REF_NAME =~ /^(master|VER_\d+_\d+)$/
-      when: never
-    - if: $CI_MERGE_REQUEST_IID
-    - if: $CI_COMMIT_REF_NAME =~ /^(master|VER_\d+_\d+)$/
-    - if: $CI_COMMIT_TAG
-    - if: $CI_PIPELINE_SOURCE =~ /^(trigger|pipeline|web|api|merge_request_event)$/
+workflow: !reference [ .common, workflow ]
 
-.rules_templates:
-  rules:
-    - if: &on_master $CI_COMMIT_REF_NAME =~ /^master$/
+variables:
+  PKG_NAME: "gnudatalanguage"
 
 stages:
-  - prepareBuild
+  - containerize
   - build
   - test
   - deploy
 
-docker-build-and-test:
-  stage: prepareBuild
-  extends: .container-build-and-push
-  variables:
-    WORKING_DIR: ${CI_PROJECT_DIR}
-    DOCKERFILE_NAME: "Dockerfile.build_and_test"
-    IMAGE_NAME: ${CI_REGISTRY_IMAGE}/${BUILD_AND_TEST_IMAGE}:${CI_COMMIT_REF_NAME}
-    BUILD_ARGS: REGISTRY=${CI_REGISTRY}
+container-build-and-test:
+  extends: .arch-containerize
   needs: []
 
 build-gnudatalanguage:
-  stage: build
-  image: ${CI_REGISTRY_IMAGE}/${BUILD_AND_TEST_IMAGE}:${CI_COMMIT_REF_NAME}
-  needs:
-    - job: "docker-build-and-test"
-      artifacts: no
   artifacts:
-    name: "${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
-    expire_in: 1 day
     paths:
-      - gnudatalanguage*.pkg.tar.zst
-  script:
-    - makepkg -s --noconfirm
-
+      - $PKG_NAME*.pkg.tar.zst
+      - src/gdl-*/build/Testing/Temporary/LastTest.log
+    when: always
+  extends: .arch-build
+  needs:
+    - job: "container-build-and-test"
+      artifacts: no
+  
 test-gnudatalanguage:
-  stage: test
-  image: ${CI_REGISTRY_IMAGE}/${BUILD_AND_TEST_IMAGE}:${CI_COMMIT_REF_NAME}
+  extends: .arch-test
   needs: ["build-gnudatalanguage"]
-  script:
-    # Try to install package
-    - sudo pacman -U --noconfirm gnudatalanguage*.pkg.tar.zst
-    # Recommended checks
-    - namcap -m PKGBUILD
-    - namcap -m gnudatalanguage*.pkg.tar.zst
 
 deploy-gnudatalanguage:
-  stage: deploy
-  extends: .git-ssh-push-remote
-  variables:
-    REMOTE_HOST: "aur.archlinux.org"
-    REMOTE_USER: "aur"
-    REMOTE_REPOSITORY: "gnudatalanguage.git"
-  before_script:
-    - echo "Uploading to AUR..."
-  rules:
-    - if: *on_master
+  extends: .arch-deploy
diff --git a/Dockerfile.build_and_test b/Dockerfile.build_and_test
index af87d051bf6f..a1d30ac13ab4 100644
--- a/Dockerfile.build_and_test
+++ b/Dockerfile.build_and_test
@@ -3,7 +3,7 @@ ARG REGISTRY
 FROM "$REGISTRY/common/gitlab-helper/archlinux-yay:master"
 
 RUN (\
-    yay -Syuq --noconfirm --needed python-numpy eigen plplot gsl hdf4 wxgtk2 fftw pslib eccodes udunits graphicsmagick libgeotiff glpk shapelib \
+    yay -Syuq --noconfirm --needed python-numpy eigen plplot gsl hdf4 wxgtk2 fftw pslib eccodes udunits graphicsmagick libgeotiff glpk shapelib openssh \
     && yes | yay -Scc --noconfirm \
     && rm -rf ~/.cache/yay \
     && sudo rm -rf /var/cache/pacman/pkg/* \
diff --git a/PKGBUILD b/PKGBUILD
index 2919ac9feda3..ceb60c1cb592 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=gnudatalanguage
 pkgver=1.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="An IDL (Interactive Data Language) compatible incremental compiler (ie. runs IDL programs)"
 arch=("i686" "x86_64")
 url="https://gnudatalanguage.github.io/"
@@ -13,6 +13,7 @@ license=("GPL")
 depends=("eccodes" "eigen" "fftw" "glpk" "graphicsmagick" "gsl" "hdf4"
          "libgeotiff" "plplot" "python-numpy" "shapelib" "udunits" "wxgtk2")
 makedepends=("cmake")
+checkdepends=("openssh")
 optdepends=("cuda")
 source=("$pkgname-$pkgver.tar.gz::https://github.com/gnudatalanguage/gdl/archive/v${pkgver}.tar.gz"
         "gdl.profile")