[SC64][CI/CD] Moved docker build environment to another repository (#7)

Polprzewodnikowy · Sep 26, 2021 · ec1fbf3 · ec1fbf3
1 parent 7207d1a
commit ec1fbf3
Show file tree

Hide file tree

Showing 14 changed files with 56 additions and 217 deletions.
diff --git a/.media/sc64_clean_pcb.jpg → .github/sc64_clean_pcb.jpg b/.media/sc64_clean_pcb.jpg → .github/sc64_clean_pcb.jpg
diff --git a/.media/sc64_in_n64.jpg → .github/sc64_in_n64.jpg b/.media/sc64_in_n64.jpg → .github/sc64_in_n64.jpg
diff --git a/.media/sc64_on_table.jpg → .github/sc64_on_table.jpg b/.media/sc64_on_table.jpg → .github/sc64_on_table.jpg
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,4 +1,4 @@
-name: Build fw/hw/sw
+name: build
 
 on:
   push:
@@ -22,7 +22,7 @@ jobs:
           submodules: true
 
       - name: Build script
-        run: ./build.sh
+        run: ./build_in_docker.sh
 
       - name: Upload artifact
         uses: actions/upload-artifact@v2

diff --git a/README.md b/README.md
@@ -66,8 +66,8 @@ Current goal is to fix bugs in SDRAM and PC modules.
 
 ## Finished sample
 
-![SummerCart64 clean PCB](.media/sc64_clean_pcb.jpg)
+![SummerCart64 clean PCB](.github/sc64_clean_pcb.jpg)
 
-![SummerCart64 on table](.media/sc64_on_table.jpg)
+![SummerCart64 on table](.github/sc64_on_table.jpg)
 
-![SummerCart64 in partialy disassembled Nintendo 64](.media/sc64_in_n64.jpg)
+![SummerCart64 in partialy disassembled Nintendo 64](.github/sc64_in_n64.jpg)
diff --git a/build.sh b/build.sh
@@ -1,3 +1,45 @@
 #!/bin/bash
 
-docker run --mount type=bind,src="$(pwd)",target="/workdir" ghcr.io/polprzewodnikowy/sc64env:v0.9 /bin/bash ./docker/build.sh
+
+PACKAGE_FILE_NAME="SummerCart64"
+FILES=(
+    "./fw/output_files/SummerCart64.pof"
+    "./hw/v1/ftdi-template.xml"
+    "./sw/cic/UltraCIC-III.hex"
+    "./sw/riscv/build/controller.rom"
+    "./LICENSE"
+)
+
+
+set -e
+
+
+pushd sw/cic
+echo "Building UltraCIC-III software"
+avra UltraCIC-III.asm -D attiny45
+popd
+
+
+pushd sw/n64
+echo "Building N64 bootloader software"
+make clean all
+popd
+
+
+pushd sw/riscv
+echo "Building RISC-V controller software"
+make clean all
+popd
+
+
+pushd fw
+echo "Building FPGA firmware"
+quartus_sh --flow compile ./SummerCart64.qpf
+popd
+
+
+echo "Zipping files"
+if [[ -e "./${PACKAGE_FILE_NAME}.zip" ]]; then
+    rm -f "./${PACKAGE_FILE_NAME}.zip"
+fi
+zip -r "./${PACKAGE_FILE_NAME}.zip" ${FILES[@]}
diff --git a/build_in_docker.sh b/build_in_docker.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker run --mount type=bind,src="$(pwd)",target="/workdir" ghcr.io/polprzewodnikowy/sc64env:v1.0 /bin/bash ./build.sh
diff --git a/docker/Dockerfile b/docker/Dockerfile
diff --git a/docker/build.sh b/docker/build.sh
diff --git a/docker/setup_quartus.sh b/docker/setup_quartus.sh
diff --git a/fw/build.sh b/fw/build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker run --mount type=bind,src="$(pwd)/..",target="/workdir" ghcr.io/polprzewodnikowy/sc64env:v1.0 /bin/bash -c "cd fw && quartus_sh --flow compile ./SummerCart64.qpf"
diff --git a/sw/n64/build.sh b/sw/n64/build.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run --mount type=bind,src="$(pwd)",target="/workdir" ghcr.io/polprzewodnikowy/sc64env:v0.9 /bin/bash -c "make clean all"
+docker run --mount type=bind,src="$(pwd)",target="/workdir" ghcr.io/polprzewodnikowy/sc64env:v1.0 /bin/bash -c "make clean all"
diff --git a/sw/riscv/build.sh b/sw/riscv/build.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run --mount type=bind,src="$(pwd)",target="/workdir" ghcr.io/polprzewodnikowy/sc64env:v0.9 /bin/bash -c "make clean all"
+docker run --mount type=bind,src="$(pwd)",target="/workdir" ghcr.io/polprzewodnikowy/sc64env:v1.0 /bin/bash -c "make clean all"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/bash

		docker run --mount type=bind,src="$(pwd)",target="/workdir" ghcr.io/polprzewodnikowy/sc64env:v1.0 /bin/bash ./build.sh