Merge pull request #62 from DILCISBoard/rel/2.0

Release v2.0.4

Author: karinbredenberg

.gitignore

@@ -1,5 +1,17 @@
 # aip-specification.pdf
 pandoc/bibliography.bib.bak
-.vagrant*
+# Site publication file
+docs/
+site/
 Gemfile.lock
-_site
+**/_site
+.classpath
+.project
+.settings
+**/*.jar
+**/target
+**/bin
+**/*.class
+.vagrant*
+.venv
+vendor

.travis.yml

@@ -3,31 +3,20 @@ sudo: required
 language: java
 jdk:
   - openjdk8
-  - oraclejdk8
-before_install:
-  - sudo apt-get update
-  - sudo apt-get install -y texlive texlive-base texlive-latex-extra texlive-fonts-extra python-virtualenv librsvg2-bin
-  - wget https://github.com/jgm/pandoc/releases/download/2.5/pandoc-2.5-linux.tar.gz
-  - tar -xzvf pandoc-2.5-linux.tar.gz
-  - rm pandoc-2.5-linux.tar.gz
-  - sudo mv pandoc-2.5 /opt
-  - sudo chmod +x /opt/pandoc-2.5/bin/pandoc
-  - sudo ln -s /opt/pandoc-2.5/bin/pandoc /usr/local/bin/pandoc
-  - sudo ln -s /opt/pandoc-2.5/bin/pandoc-citeproc /usr/local/bin/pandoc-citeproc
-  - bundle install
 script:
-  - bash create-site.sh
-  - bundle exec jekyll build -s ./docs -d ./_site
-  - bundle exec htmlproofer ./_site --file-ignore /javadoc/ --only-4xx --check-html
-  - bash create-pdf.sh
+  - docker run -it --rm -v "$PWD:/source" -u "$(id -u):$(id -g)" --entrypoint /source/create-site.sh eark4all/spec-pdf-publisher
+  - docker run -it --rm -v "$PWD:/source" -u "$(id -u):$(id -g)" --entrypoint /source/create-pdf.sh eark4all/spec-pdf-publisher
+  - mkdir site
+  - docker run -it --rm -v "$PWD"/docs:/usr/src/app -v "$PWD"/site:/_site -u "$(id -u):$(id -g)" starefossen/github-pages jekyll build -d /_site
+  # - bundle install
+  # - bundle exec htmlproofer ./site --file-ignore /javadoc/ --only-4xx --check-html
 deploy:
   provider: pages
   skip_cleanup: true
   github_token: $GH_TOKEN
   keep_history: true
-  fqdn: earkaip.dilcis.eu
-  local_dir: docs
-  fqdn: earkaip.dilcis.eu
+  local_dir: site
+  fqdn: "$CNAME"
   on:
     branch: master
 env:

Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 gem 'github-pages', group: :jekyll_plugins
-gem "jekyll-theme-primer", group: :jekyll_plugin
 gem 'html-proofer'

RELEASENOTES.md

@@ -0,0 +1,55 @@
+---
+title: Release Notes
+---
+
+RELEASE NOTES
+=============
+
+Categories of specification change
+-----------------------------------
+
+### Major
+Changes are not backwardly compatible with previous versions.
+A new major version, e.g. from 2.x.y to 3.0.0
+
+### Minor
+Backward compatible changes with the current major version.
+Often a new feature or extension.
+
+### Corrections
+Corrections and improvements to grammar and spelling, not intended
+to change the meaning of the specification.
+
+### Administrative:
+Standard changes between versions, e.g. version number and release date.
+
+Version 2.0.4
+-------------
+June 12th 2020
+
+### Specification Changes
+
+#### Major
+None
+
+#### Minor
+None
+
+#### Corrections
+- Minor typos and corrections [[#60][]].
+
+#### Administrative
+- Revision history update and version bumps [[#55][], [#59][]].
+
+### Web site and PDF presentation
+- Uniform site structure and DILCIS branding:
+  + Descriptions for Baigit profile resources [[#58][]].
+  + Standard access to archive PDF versions [[#57][]].
+  + Updates to Docker site production and Travis publication [[#56][]].
+
+[#60]: https://github.com/DILCISBoard/E-ARK-AIP/pull/60/
+[#59]: https://github.com/DILCISBoard/E-ARK-AIP/pull/59/
+[#58]: https://github.com/DILCISBoard/E-ARK-AIP/pull/58/
+[#57]: https://github.com/DILCISBoard/E-ARK-AIP/pull/57/
+[#56]: https://github.com/DILCISBoard/E-ARK-AIP/pull/56/
+[#55]: https://github.com/DILCISBoard/E-ARK-AIP/pull/55/