From 92cc4fa8b570384c6a5520952ddd8097c4c31031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Sowi=C5=84ski?= <ostrzycielnozyczek@gmail.com>
Date: Wed, 24 Apr 2024 15:33:07 +0200
Subject: [PATCH] Fix deprecated CI dependencies (#7)

* Fix deprecated CI dependencies

* Fix linter CI

* Fix linting errors
---
 .github/workflows/linter.yml         |  8 +++++---
 .github/workflows/pre-release.yml    | 14 +++++++++-----
 .github/workflows/tagged-release.yml | 12 ++++++++----
 rdf.proto                            | 24 +++++++++++++++---------
 4 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 1124a16..67a9831 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -11,15 +11,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # Full git history is needed to get a proper
           # list of changed files within `super-linter`
           fetch-depth: 0
+
       - name: Lint codebase
-        uses: github/super-linter@v4
+        uses: super-linter/super-linter@v6
         env:
           # This repo is small enough for a full check
           VALIDATE_ALL_CODEBASE: true
-          DEFAULT_BRANCH: master
+          VALIDATE_CHECKOV: false
+          VALIDATE_NATURAL_LANGUAGE: false
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
index dd15c38..03690a1 100644
--- a/.github/workflows/pre-release.yml
+++ b/.github/workflows/pre-release.yml
@@ -11,12 +11,16 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
-      - uses: "marvinpinto/action-automatic-releases@v1.2.1"
+      - uses: ncipollo/release-action@v1.14.0
         with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "dev"
+          allowUpdates: true
           prerelease: true
+          draft: false
+          omitDraftDuringUpdate: false
+          makeLatest: false
+          tag: dev
           title: "Development build"
-          files: '*.proto'
+          artifacts: '*.proto'
+          generateReleaseNotes: true
diff --git a/.github/workflows/tagged-release.yml b/.github/workflows/tagged-release.yml
index ff58f8c..792bf12 100644
--- a/.github/workflows/tagged-release.yml
+++ b/.github/workflows/tagged-release.yml
@@ -11,10 +11,14 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
-      - uses: "marvinpinto/action-automatic-releases@v1.2.1"
+      - uses: ncipollo/release-action@v1.14.0
         with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
           prerelease: false
-          files: '*.proto'
+          draft: false
+          makeLatest: true
+          tag: "${{ env.GITHUB_REF_NAME }}"
+          name: "${{ env.GITHUB_REF_NAME }}"
+          artifacts: '*.proto'
+          generateReleaseNotes: true
diff --git a/rdf.proto b/rdf.proto
index 429427e..c2da50e 100644
--- a/rdf.proto
+++ b/rdf.proto
@@ -5,7 +5,8 @@ package eu.ostrzyciel.jelly.core.proto.v1;
 // Protocol version: 1.0.0
 
 // RDF IRIs
-// Either prefix_id or name_id can be zero if the prefix or the suffix are not used.
+// Either prefix_id or name_id can be zero if the prefix or the suffix
+// are not used.
 message RdfIri {
   // 1-based, refers to an entry in the prefix lookup.
   uint32 prefix_id = 1;
@@ -24,7 +25,8 @@ message RdfLiteral {
     RdfLiteralSimple simple = 2;
     // Language-tagged string.
     string langtag = 3;
-    // Typed literal. The datatype is a reference to an entry in the datatype lookup.
+    // Typed literal. The datatype is a reference to an entry in the
+    // datatype lookup.
     uint32 datatype = 4;
   }
 }
@@ -49,7 +51,8 @@ message RdfTerm {
     RdfLiteral    literal = 3;
     // RDF-star quoted triple
     RdfTriple     triple_term = 4;
-    // Repeated term from the previous statement. Only valid in statements, not quoted triples.
+    // Repeated term from the previous statement.
+    // Only valid in statements, not quoted triples.
     RdfRepeat     repeat = 10;
   }
 }
@@ -172,12 +175,15 @@ enum PhysicalStreamType {
 // Logical stream type, according to the RDF Stream Taxonomy (RDF-STaX).
 // Type 0 is reserved for the unspecified stream type.
 // The rest of the type numbers follow the taxonomical structure of RDF-STaX.
-// For example: 1 is a subtype of 0, 13 and 23 are subtypes of 3, 114 is a subtype of 14, etc.
-// Types 1–4 correspond to the four base concrete stream types. Their subtypes can be
-// in most cases simply processed in the same way as the base types.
-// Therefore, implementations can take the modulo 10 of the stream type to determine
-// the base type of the stream and use this information to select the appropriate
-// processing logic.
+// For example: 1 is a subtype of 0, 13 and 23 are subtypes of 3, 
+// 114 is a subtype of 14, etc.
+// 
+// Types 1–4 correspond to the four base concrete stream types. Their 
+// subtypes can be in most cases simply processed in the same way as 
+// the base types.
+// Therefore, implementations can take the modulo 10 of the stream 
+// type to determine the base type of the stream and use this information 
+// to select the appropriate processing logic.
 //
 // RDF-STaX version: 1.1.0
 // https://w3id.org/stax/1.1.0