Revert "Update to latest testplugin"

.github/workflows/CI_Merge.yml

@@ -1,34 +1,14 @@
-# This is a basic workflow to help you get started with Actions
 name: CI_Merge
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the master branch
 on:
-  # only deal with push events
   push:
     branches: [ master, Beta, Alpha, Experimental ]
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
   job1:
-    # The type of runner that the job will run on
-    if: github.repository == 'OpenCPN/plugins'
+    # if: github.repository == 'OpenCPN/plugins'
     runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v2
-    - name: install pathlib
-      run: |
-        pip install pathlib
-    - name: create ocpn-plugins.xml
-      run: |
-        python tools/ocpn-metadata generate --userdir metadata --destfile ocpn-plugins.xml --force
-        echo "user.name: $GITHUB_ACTOR"
-        git config --local user.email "[email protected]"
-        git config --local user.name "$GITHUB_ACTOR"
-        git add ocpn-plugins.xml
-        git commit -m "Updating the repository GitHub ocpn-plugins.xml" -a
-        git push
-
+      - uses: actions/checkout@v2
+      - name: Update ocpn-plugins.xml
+        run: ci/ga_merge.sh
+        env:
+          UPSTREAM: ${{ secrets.UPSTREAM }}

.github/workflows/CI_Pull.yml

@@ -1,38 +1,12 @@
-# This is a basic workflow to help you get started with Actions
 name: CI_Pull
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the master branch
 on:
   pull_request:
     branches: [ master, Alpha, Beta, Experimental ]
     types: [ opened, reopened, edited, review_requested, synchronize ]
-    paths:
-    - 'metadata/**.xml'
-
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
   job1:
-    # The type of runner that the job will run on
     runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
-      - name: install_utils
-        run: sudo apt install libxml2-utils
-
-      - name: check pr files
-        run: |
-          echo "REQUEST_NO=${{ github.event.pull_request.number }}" >> $GITHUB_ENV
-          echo "github.repository: ${{ github.repository }}"
-
-      - name: check xml files
-        run: |
-          bash ./validate_xml.sh
-          rc=$?
-          exit $rc
-
-
+      - name: Check PR files
+        run: ci/ga_pull.sh

.github/workflows/cronjob.yml

@@ -0,0 +1,12 @@
+---
+name: Nightly check
+on:
+  schedule:
+    - cron: '55 5 * * *'
+jobs:
+  job1:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Check metadata
+        run: tools/check-metadata-urls metadata/*xml

.gitignore

@@ -1,2 +1 @@
-.directory
 

ci/ga_merge.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/bash
+
+# Merge another branch, possibly a pull request. Ensure that ocpn-plugins.xml
+# reflects actual metadata, re-generating it if required.
+#
+# 'actual metadata' refers to upstream, by default
+# https://github.com/OpenCPN/plugins.git. For test purposes, the environment
+# variable UPSTREAM can be used to override this value.
+
+set -e
+
+if [ -z "$GITHUB_REF" ]; then
+    echo 'Cannot determine upstream base ref using $GITHUB_REF - exiting'
+    exit 0;
+fi
+upstream=${UPSTREAM:-https://github.com/OpenCPN/plugins.git}
+echo "Using upstream: ... ${upstream##https:}"
+git remote add upstream $upstream
+git fetch upstream $GITHUB_REF:base_branch
+
+tools/ocpn-metadata generate --userdir metadata --destfile ocpn-plugins.new
+sed  -ie  '/<date>/d' ocpn-plugins.new ocpn-plugins.xml
+if git diff -b --quiet --no-index ocpn-plugins.xml ocpn-plugins.new; then
+    echo "ocpn-plugins.xml is already  up do date -- exiting"
+    exit 0
+fi
+
+echo "Re-generating ocpn-plugins.xml to match metadata."
+tools/ocpn-metadata generate \
+    --userdir metadata --destfile ocpn-plugins.xml  --force
+git config --local user.email "[email protected]"
+git config --local user.name "$GITHUB_ACTOR"
+git add ocpn-plugins.xml
+git commit -m "Automatic update of ocpn-plugins.xml" -a
+git push

ci/ga_pull.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+#
+# Validate all metadata which differs from upstream metadata at
+# https://github.com/OpenCPN/plugins.git. Requires a pull request
+# context where GITHUB_BASE_REF is defined.
+
+set -e
+
+sudo apt-get install libxml2-utils
+
+base_branch=$GITHUB_BASE_REF
+git remote add upstream https://github.com/OpenCPN/plugins.git
+git fetch upstream $base_branch
+
+if git diff --quiet upstream/$base_branch -- metadata; then
+    echo "No metadata changes, nothing to check."
+    exit 0
+fi
+
+exit_rc=0
+for f in $(git diff --name-only --diff-filter=ACMR upstream/$base_branch HEAD)
+do
+    if [[ "$f" == metadata*.xml ]]; then
+        echo "Processing file: $f"
+        xmllint --schema ocpn-plugins.xsd $f --noout || exit_rc=$((exit_rc | 1))
+        tools/check-metadata-urls $f || exit_rc=$((exit_rc | 2))
+    fi
+done
+
+if [ $exit_rc = 0 ];          then echo "All files pass checks" fi; fi
+if [ $((exit_rc & 1 )) = 1 ]; then echo "xmllint error(s)"; fi
+if [ $((exit_rc & 2 )) = 2 ]; then echo "Url access or checksum error(s)"; fi
+exit $exit_rc

metadata/Logbook-v1.4.17.0-darwin-10.13.6.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- https://circleci.com/gh/rgleason/LogbookKonni_pi/1017 -->
+<plugin version="1">
+  <name> Logbook </name>
+  <version> 1.4.17.0+1017.v1.4.17.0 </version>
+  <release> 0 </release>
+  <summary> Complex, feature-rich logbook </summary>
+
+  <api-version> 1.16 </api-version>
+  <open-source> yes </open-source>
+  <author> Del Elson </author>
+  <source> https://github.com/rgleason/LogbookKonni_pi </source>
+  <info-url> https://opencpn.org/OpenCPN/plugins/logbookkonni.html </info-url>
+
+  <description> Complex logbook with a lot of features including a customizable layout.
+To use all the features, you will have to download and install the Layout Files as instructed when you run the plugin for the first time.
+
+Help is available on YouTube, search LogbookKonni
+ </description>
+
+  <target>darwin</target>
+  <target-version>10.13.6</target-version>
+  <target-arch>x86_64</target-arch>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/logbookkonni-prod/raw/names/Logbook-v1.4.17.0-darwin-10.13.6-tarball/versions/1.4.17.0+1017.v1.4.17.0/Logbook-v1.4.17.0_darwin-10.13.6-x86_64.tar.gz </tarball-url>
+  <tarball-checksum> 6febe49a1fb091dd36815b8153b9bbdc24dc83430ca3a64f02210e2350dd31f5 </tarball-checksum>
+</plugin>

metadata/Logbook-v1.4.17.0-debian-10.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- https://circleci.com/gh/rgleason/LogbookKonni_pi/1012 -->
+<plugin version="1">
+  <name> Logbook </name>
+  <version> 1.4.17.0+1012.v1.4.17.0 </version>
+  <release> 0 </release>
+  <summary> Complex, feature-rich logbook </summary>
+
+  <api-version> 1.16 </api-version>
+  <open-source> yes </open-source>
+  <author> Del Elson </author>
+  <source> https://github.com/rgleason/LogbookKonni_pi </source>
+  <info-url> https://opencpn.org/OpenCPN/plugins/logbookkonni.html </info-url>
+
+  <description> Complex logbook with a lot of features including a customizable layout.
+To use all the features, you will have to download and install the Layout Files as instructed when you run the plugin for the first time.
+
+Help is available on YouTube, search LogbookKonni
+ </description>
+
+  <target>debian-x86_64</target>
+  <target-version>10</target-version>
+  <target-arch>x86_64</target-arch>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/logbookkonni-prod/raw/names/Logbook-v1.4.17.0-debian-10-tarball/versions/1.4.17.0+1012.v1.4.17.0/Logbook-v1.4.17.0_debian-10-x86_64.tar.gz </tarball-url>
+  <tarball-checksum> f125a68889ebe5734ff5e2764bee24ae35f06d821120efc0196aedff460808f7 </tarball-checksum>
+</plugin>

metadata/Logbook-v1.4.17.0-flatpak-18.08.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- https://circleci.com/gh/rgleason/LogbookKonni_pi/1015 -->
+<plugin version="1">
+  <name> Logbook </name>
+  <version> 1.4.17.0+1015.v1.4.17.0 </version>
+  <release> 0 </release>
+  <summary> Complex, feature-rich logbook </summary>
+
+  <api-version> 1.16 </api-version>
+  <open-source> yes </open-source>
+  <author> Del Elson </author>
+  <source> https://github.com/rgleason/LogbookKonni_pi </source>
+  <info-url> https://opencpn.org/OpenCPN/plugins/logbookkonni.html </info-url>
+
+  <description> Complex logbook with a lot of features including a customizable layout.
+To use all the features, you will have to download and install the Layout Files as instructed when you run the plugin for the first time.
+
+Help is available on YouTube, search LogbookKonni
+ </description>
+
+  <target>flatpak-x86_64</target>
+  <target-version>18.08</target-version>
+  <target-arch>x86_64</target-arch>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/logbookkonni-prod/raw/names/Logbook-v1.4.17.0-flatpak-18.08-tarball/versions/1.4.17.0+1015.v1.4.17.0/Logbook-v1.4.17.0_flatpak-18.08-x86_64.tar.gz </tarball-url>
+  <tarball-checksum> dee0c93080e344469de6ed332befd4fd2e666c2bac6562a5ac5ccac42e66f258 </tarball-checksum>
+</plugin>

metadata/Logbook-v1.4.17.0-flatpak-20.08.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- https://circleci.com/gh/rgleason/LogbookKonni_pi/1011 -->
+<plugin version="1">
+  <name> Logbook </name>
+  <version> 1.4.17.0+1011.v1.4.17.0 </version>
+  <release> 0 </release>
+  <summary> Complex, feature-rich logbook </summary>
+
+  <api-version> 1.16 </api-version>
+  <open-source> yes </open-source>
+  <author> Del Elson </author>
+  <source> https://github.com/rgleason/LogbookKonni_pi </source>
+  <info-url> https://opencpn.org/OpenCPN/plugins/logbookkonni.html </info-url>
+
+  <description> Complex logbook with a lot of features including a customizable layout.
+To use all the features, you will have to download and install the Layout Files as instructed when you run the plugin for the first time.
+
+Help is available on YouTube, search LogbookKonni
+ </description>
+
+  <target>flatpak-x86_64</target>
+  <target-version>20.08</target-version>
+  <target-arch>x86_64</target-arch>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/logbookkonni-prod/raw/names/Logbook-v1.4.17.0-flatpak-20.08-tarball/versions/1.4.17.0+1011.v1.4.17.0/Logbook-v1.4.17.0_flatpak-20.08-x86_64.tar.gz </tarball-url>
+  <tarball-checksum> 6b6b7f5f69aa9c7ed19b961b7293dbd8be37b22dbf45b2017379c09e6e969f95 </tarball-checksum>
+</plugin>

metadata/Logbook-v1.4.17.0-flatpak-A64-20.08.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- https://circleci.com/gh/rgleason/LogbookKonni_pi/1008 -->
+<plugin version="1">
+  <name> Logbook </name>
+  <version> 1.4.17.0+1008.v1.4.17.0 </version>
+  <release> 0 </release>
+  <summary> Complex, feature-rich logbook </summary>
+
+  <api-version> 1.16 </api-version>
+  <open-source> yes </open-source>
+  <author> Del Elson </author>
+  <source> https://github.com/rgleason/LogbookKonni_pi </source>
+  <info-url> https://opencpn.org/OpenCPN/plugins/logbookkonni.html </info-url>
+
+  <description> Complex logbook with a lot of features including a customizable layout.
+To use all the features, you will have to download and install the Layout Files as instructed when you run the plugin for the first time.
+
+Help is available on YouTube, search LogbookKonni
+ </description>
+
+  <target>flatpak-aarch64</target>
+  <target-version>20.08</target-version>
+  <target-arch>aarch64</target-arch>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/logbookkonni-prod/raw/names/Logbook-v1.4.17.0-flatpak-A64-20.08-tarball/versions/1.4.17.0+1008.v1.4.17.0/Logbook-v1.4.17.0_flatpak-20.08-aarch64.tar.gz </tarball-url>
+  <tarball-checksum> f757488266ea937594d7c1e1c81f128327083d40a2d3ef7f09bd0b265591937d </tarball-checksum>
+</plugin>

metadata/Logbook-v1.4.17.0-msvc-10.0.14393(1).xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- https://ci.appveyor.com/project/rgleason/logbookkonni-pi/builds/40167582 -->
+<plugin version="1">
+  <name> Logbook </name>
+  <version> 1.4.17.0+128.v1.4.17.0 </version>
+  <release> 0 </release>
+  <summary> Complex, feature-rich logbook </summary>
+
+  <api-version> 1.16 </api-version>
+  <open-source> yes </open-source>
+  <author> Del Elson </author>
+  <source> https://github.com/rgleason/LogbookKonni_pi </source>
+  <info-url> https://opencpn.org/OpenCPN/plugins/logbookkonni.html </info-url>
+
+  <description> Complex logbook with a lot of features including a customizable layout.
+To use all the features, you will have to download and install the Layout Files as instructed when you run the plugin for the first time.
+
+Help is available on YouTube, search LogbookKonni
+ </description>
+
+  <target>msvc</target>
+  <target-version>10.0.14393</target-version>
+  <target-arch>x86_64</target-arch>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/logbookkonni-prod/raw/names/Logbook-v1.4.17.0-msvc-10.0.14393-tarball/versions/1.4.17.0+128.v1.4.17.0/Logbook-v1.4.17.0_msvc-10.0.14393-win32.tar.gz </tarball-url>
+  <tarball-checksum> d310f0d6f7d8b560f5f9f7b549260620b65582792e2514f69edd3d614d725cc2 </tarball-checksum>
+</plugin>

metadata/Logbook-v1.4.17.0-msvc-10.0.14393.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- https://ci.appveyor.com/project/rgleason/logbookkonni-pi/builds/40167584 -->
+<plugin version="1">
+  <name> Logbook </name>
+  <version> 1.4.17.0+129.v1.4.17.0 </version>
+  <release> 0 </release>
+  <summary> Complex, feature-rich logbook </summary>
+
+  <api-version> 1.16 </api-version>
+  <open-source> yes </open-source>
+  <author> Del Elson </author>
+  <source> https://github.com/rgleason/LogbookKonni_pi </source>
+  <info-url> https://opencpn.org/OpenCPN/plugins/logbookkonni.html </info-url>
+
+  <description> Complex logbook with a lot of features including a customizable layout.
+To use all the features, you will have to download and install the Layout Files as instructed when you run the plugin for the first time.
+
+Help is available on YouTube, search LogbookKonni
+ </description>
+
+  <target>msvc</target>
+  <target-version>10.0.14393</target-version>
+  <target-arch>x86_64</target-arch>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/logbookkonni-prod/raw/names/Logbook-v1.4.17.0-msvc-10.0.14393-tarball/versions/1.4.17.0+129.v1.4.17.0/Logbook-v1.4.17.0_msvc-10.0.14393-win32.tar.gz </tarball-url>
+  <tarball-checksum> 12c29c718ede4934b8610870d1fcdbff97909d50951341e5ab44d66cb1ee1719 </tarball-checksum>
+</plugin>