Switch the Test and Package stages

In order to simplify the testing of each package, do the packaging step first so
that when it gets to the testing stage it can load the packaged files from the
local repository and manage the interdependencies that way.

1 files changed, 43 insertions, 39 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 613980f..d5151b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,8 +2,8 @@ image: silex/emacs:26.3-alpine-dev
 
 stages:
   - pre-package-multifile
-  - test
   - package
+  - test
   - deploy
 
 package-oni-conf:
@@ -116,71 +116,75 @@ package-oni-twig:
     paths:
       - oni-twig/dist/
 
+package:
+  stage: package
+  dependencies:
+    - package-oni-conf
+    - package-oni-css
+    - package-oni-elisp
+    - package-oni-haml
+    - package-oni-html
+    - package-oni-nxml
+    - package-oni-org
+    - package-oni-php
+    - package-oni-python
+    - package-oni-ruby
+    - package-oni-twig
+  before_script:
+    - rm -rf bin/
+    - mkdir bin/
+  script: make package
+  artifacts:
+    paths:
+      - bin/
+
 test-oni-alert:
   stage: test
-  script: make test-oni-alert
+  dependencies:
+    - package
+  script: make test-oni-alert TEST_ARCHIVE=$(realpath bin/)
 
 test-oni-bookmark:
   stage: test
-  script: make test-oni-bookmark
+  dependencies:
+    - package
+  script: make test-oni-bookmark TEST_ARCHIVE=$(realpath bin/)
 
 test-oni-conf:
   stage: test
   dependencies:
-    - package-oni-conf
-  needs: [package-oni-conf]
-  script: make test-oni-conf
+    - package
+  script: make test-oni-conf TEST_ARCHIVE=$(realpath bin/)
 
 test-oni-css:
   stage: test
   dependencies:
-    - package-oni-css
-  needs: [package-oni-css]
-  script: make test-oni-css
+    - package
+  script: make test-oni-css TEST_ARCHIVE=$(realpath bin/)
 
 test-oni-elisp:
   stage: test
   dependencies:
-    - package-oni-elisp
-  needs: [package-oni-elisp]
-  script: make test-oni-elisp
+    - package
+  script: make test-oni-elisp TEST_ARCHIVE=$(realpath bin/)
 
 test-oni-grep:
   stage: test
-  script: make test-oni-grep
+  dependencies:
+    - package
+  script: make test-oni-grep TEST_ARCHIVE=$(realpath bin/)
 
 test-oni-highlight-indent-guides:
   stage: test
-  script: make test-oni-highlight-indent-guides
+  dependencies:
+    - package
+  script: make test-oni-highlight-indent-guides TEST_ARCHIVE=$(realpath bin/)
 
 test-oni-php:
   stage: test
   dependencies:
-    - package-oni-php
-  needs: [package-oni-php]
-  script: make test-oni-php
-
-package:
-  stage: package
-  dependencies:
-    - package-oni-conf
-    - package-oni-css
-    - package-oni-elisp
-    - package-oni-haml
-    - package-oni-html
-    - package-oni-nxml
-    - package-oni-org
-    - package-oni-php
-    - package-oni-python
-    - package-oni-ruby
-    - package-oni-twig
-  before_script:
-    - rm -rf bin/
-    - mkdir bin/
-  script: make package
-  artifacts:
-    paths:
-      - bin/
+    - package
+  script: make test-oni-php TEST_ARCHIVE=$(realpath bin/)
 
 deploy:
   stage: deploy