generate package task after pdf files have been created.

2 files changed, 23 insertions, 20 deletions

diff --git a/.gitlab/ci/release.gitlab-ci.yml b/.gitlab/ci/release.gitlab-ci.yml
index bc690fc..f0fa81c 100644
--- a/.gitlab/ci/release.gitlab-ci.yml
+++ b/.gitlab/ci/release.gitlab-ci.yml
@@ -5,7 +5,7 @@ tarball:
   stage: release
   script:
     - cd /code
-    - bundle exec rake clean pdf repackage
+    - bundle exec rake clean pdf tarball
   after_script:
     - mv /code/pkg $CI_PROJECT_DIR
   artifacts:
diff --git a/Rakefile b/Rakefile
index 2d943ee..21d8a73 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,23 +1,26 @@
 require 'date'
 require 'rake/packagetask'
 
-Rake::PackageTask.new("comp-268-2", DateTime.now.strftime("%y%m").to_i) do |package|
-  package.need_tar_gz = true
-  package.package_files.add([
-    '.dockerignore',
-    '.gitignore',
-    'Dockerfile',
-    'Gemfile*',
-    'README.*',
-    'Rakefile',
-    'doc/*.pdf',
-    'package.json',
-    'pom.xml',
-    'src/**/*.java',
-    'src/**/*.md',
-    'src/**/*.pdf',
-    'yarn.lock',
-  ])
+task :tarball do
+  Rake::PackageTask.new("comp-268-2", DateTime.now.strftime("%y%m").to_i) do |package|
+    package.need_tar_gz = true
+    package.package_files.add([
+      '.dockerignore',
+      '.gitignore',
+      'Dockerfile',
+      'Gemfile*',
+      'README.*',
+      'Rakefile',
+      'doc/*.pdf',
+      'package.json',
+      'pom.xml',
+      'src/**/*.java',
+      'src/**/*.md',
+      'src/**/*.pdf',
+      'yarn.lock',
+    ])
+  end
+  Rake.application['repackage'].invoke
 end
 
 def run_cli(selection = nil)
@@ -34,10 +37,10 @@ task(:pdf) do
   end
 end
 
-task(:clean) { sh 'rm -fr pkg target' }
+task(:clean) { sh 'rm -fr pkg target src/**/README.pdf' }
 task(:test) { sh 'mvn test' }
 task(doc: [:pdf]) { sh 'mvn javadoc:javadoc' }
-task publish: [:clean, :test, :doc, :repackage]
+task publish: [:clean, :test, :doc, :tarball]
 task(:build) { sh "mvn package" }
 
 desc "run the CLI"