From 3dcac7333e36285fe50e11deb400f8c3dc9f6eb4 Mon Sep 17 00:00:00 2001
From: Ahmad <root@ahmadafuni.com>
Date: Fri, 5 Apr 2024 20:34:25 +1000
Subject: [PATCH] Workflow changes

---
 .github/workflows/build.yml | 18 ++++++++++++++----
 Makefile.am                 |  5 ++++-
 tests/data.scm              |  4 ++++
 tests/decode.scm            |  7 +++----
 tests/encode.scm            |  7 +++----
 5 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 13bf9a7..493def5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,8 +14,18 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Install Guix
-      uses: PromyLOPh/guix-install-action@v1
-    - name: Build package
+    - name: Install dependencies
       run: |
-        guix build -f guix.scm
\ No newline at end of file
+        sudo apt update
+	sudo apt install automake autoconf pkg-config make
+	sudo apt install guile-3.0 guile-3.0-libs guile-3.0-dev	
+    - name: Generate scripts
+      run: |
+        ./autogen.sh
+    - name: Run configuration script
+      run: |
+        ./configure
+    - name: Check distribution
+        make distcheck
+
+
diff --git a/Makefile.am b/Makefile.am
index 8c7d87d..58fcc34 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,5 +10,8 @@ TESTS_ENVIRONMENT = $(AM_V_GEN)$(top_builddir)/pre-inst-env
 
 EXTRA_DIST =					\
 	README.org				\
-	autogen.sh		\
+	autogen.sh				\
+	pre-inst-env.in
+EXTRA_DIST +=					\
+	$(TESTS)				\
 	tests/data.scm
diff --git a/tests/data.scm b/tests/data.scm
index 615a76e..42672a8 100644
--- a/tests/data.scm
+++ b/tests/data.scm
@@ -1,5 +1,9 @@
 ;; RLP encoding/decoding test data
 ;; Examples taken from https://ethereum.org/en/developers/docs/data-structures-and-encoding/rlp/
+(import
+ (only (rlp) number->be-bytes rlp-encode)
+ (scheme base)
+ (srfi 1))
 (define bv-test-data
   (zip
    (list ; Unencoded strings
diff --git a/tests/decode.scm b/tests/decode.scm
index 8710019..40c54bb 100755
--- a/tests/decode.scm
+++ b/tests/decode.scm
@@ -1,11 +1,10 @@
 #!/usr/bin/guile -s
 !#
 ;; RLP decoding tests.
-(import (only (rlp) number->be-bytes rlp-decode)
-	(scheme base)
-	(srfi 1)
+(import (only (rlp) rlp-decode)
 	(srfi 64))
-(include "data.scm")
+
+(load "data.scm")
 
 (test-begin "bv-decode-test")
 (for-each
diff --git a/tests/encode.scm b/tests/encode.scm
index d6ee3a9..b8d3c91 100755
--- a/tests/encode.scm
+++ b/tests/encode.scm
@@ -1,11 +1,10 @@
 #!/usr/bin/guile -s
 !#
 ;; RLP encoding tests.
-(import (only (rlp) number->be-bytes rlp-encode)
-	(scheme base)
-	(srfi 1)
+(import (only (rlp) rlp-encode)
 	(srfi 64))
-(include "data.scm")
+
+(load "data.scm")
 
 (test-begin "bv-encode-test")
 (for-each