Fix build errors

.github/workflows/makefile.yml

@@ -11,7 +11,9 @@ jobs:
       with:
         submodules: recursive
     - name: install tools
-      run: gem install --user-install cbor-diag cddl
+      run: |
+        gem install --user-install cbor-diag
+        gem install --user-install cddl -v 0.10.6
     - name: set up PATH
       run: echo "$(gem env gempath | cut -d':' -f1)/bin" >> $GITHUB_PATH
     - name: assemble and test

.gitignore

@@ -1,2 +1,4 @@
 *-autogen.cddl
 draft-ietf-rats-corim
+Gemfile.lock
+.ruby-version

.gitmodules

@@ -2,4 +2,4 @@
 	path = draft-ietf-rats-corim
 	url = https://github.com/ietf-rats-wg/draft-ietf-rats-corim
 	branch = main
-	update = rebase
+	update = merge

Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'json_pure'
+gem 'cddl', [ '>=0.10.6' ]
+gem 'cbor-diag', '=0.8.1'

Makefile

@@ -2,11 +2,12 @@
 
 SHELL := /bin/bash
 
-CORIM_DIR := draft-ietf-rats-corim/cddl/
+CORIM_DIR := draft-ietf-rats-corim/
+CORIM_FRAGS_DIR := draft-ietf-rats-corim/cddl/
 CE_DIR := ./
 
-include $(CORIM_DIR)corim-frags.mk
-CORIM_DEPS := $(addprefix $(CORIM_DIR), $(CORIM_FRAGS))
+include $(CORIM_FRAGS_DIR)corim-frags.mk
+CORIM_DEPS := $(addprefix $(CORIM_FRAGS_DIR), $(CORIM_FRAGS))
 
 include tools.mk
 include funcs.mk