Merge remote-tracking branch 'assignments-base/assignment6'

cu-ecen-aeld · Oct 12, 2024 · 2b58705 · 2b58705
2 parents e57b4a5 + 347f388
commit 2b58705
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
@@ -16,7 +16,7 @@ jobs:
           - name: Run unit test
             run: ./unit-test.sh
     full-test:
-        container: cuaesd/aesd-autotest:24-assignment5
+        container: cuaesd/aesd-autotest:24-assignment6
         runs-on: self-hosted
         steps:
           - uses: actions/checkout@v2

diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,12 @@ crosstool-ng
 aesd-build
 .vscode/
 test.sh.log
+<<<<<<< HEAD
 assignment-autotest/
 aesdsocket
 *.log
+=======
+aesdsocket
+server/aesdsocket
+server/valgrind-out.txt
+assignments-base/assignment6
diff --git a/conf/assignment.txt b/conf/assignment.txt
@@ -1 +1 @@
-assignment5
+assignment6