ci: container steps are built ahead of time, avoid it (actions/runner…

…#814)
hdl · Nov 23, 2020 · 615011b · 615011b
1 parent 66159b9
commit 615011b
Show file tree

Hide file tree

Showing 12 changed files with 88 additions and 67 deletions.
diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
@@ -27,17 +27,20 @@ jobs:
         docker build -t hdlc/build:build --target build - < base.dockerfile
         docker build -t hdlc/build:dev - < base.dockerfile
 
-    - uses: docker://hdlc/build:base
-      with:
-        args: ./test/build--base.sh
-
-    - uses: docker://hdlc/build:build
-      with:
-        args: ./test/build--build.sh
-
-    - uses: docker://hdlc/build:dev
-      with:
-        args: ./test/build--dev.sh
+    - run: docker run --rm -v $(pwd):/wrk hdlc/build:base /wrk/test/build--base.sh
+      #uses: docker://hdlc/build:base
+      #with:
+      #  args: ./test/build--base.sh
+
+    - run: docker run --rm -v $(pwd):/wrk hdlc/build:build /wrk/test/build--build.sh
+      #uses: docker://hdlc/build:build
+      #with:
+      #  args: ./test/build--build.sh
+
+    - run: docker run --rm -v $(pwd):/wrk hdlc/build:dev /wrk/test/build--dev.sh
+      #uses: docker://hdlc/build:dev
+      #with:
+      #  args: ./test/build--dev.sh
 
     - name: Deploy to DockerHub
       run: |

diff --git a/.github/workflows/formal.yml b/.github/workflows/formal.yml
@@ -25,9 +25,10 @@ jobs:
       run: |
         docker build -t hdlc/formal - < formal.dockerfile
 
-    - uses: docker://hdlc/formal
-      with:
-        args: ./test/formal.sh
+    - run: docker run --rm -v $(pwd):/wrk hdlc/formal /wrk/test/formal.sh
+      #uses: docker://hdlc/formal
+      #with:
+      #  args: ./test/formal.sh
 
     - name: Deploy to DockerHub
       run: |

diff --git a/.github/workflows/ghdl-yosys-plugin.yml b/.github/workflows/ghdl-yosys-plugin.yml
@@ -27,13 +27,15 @@ jobs:
         docker build -t hdlc/ghdl:yosys - < ghdl-yosys-plugin.dockerfile
 
     - name: TODO test hdlc/pkg:ghdl-yosys-plugin
-      uses: docker://alpine
-      with:
-        args: ./test/todo.sh
-
-    - uses: docker://hdlc/ghdl:yosys
-      with:
-        args: ./test/ghdl--yosys.sh
+      run: docker run --rm -v $(pwd):/wrk alpine /wrk/test/todo.sh
+      #uses: docker://alpine
+      #with:
+      #  args: ./test/todo.sh
+
+    - run: docker run --rm -v $(pwd):/wrk hdlc/ghdl:yosys /wrk/test/ghdl--yosys.sh
+      #uses: docker://hdlc/ghdl:yosys
+      #with:
+      #  args: ./test/ghdl--yosys.sh
 
     - name: Deploy to DockerHub
       run: |

diff --git a/.github/workflows/ghdl.yml b/.github/workflows/ghdl.yml
@@ -27,13 +27,15 @@ jobs:
         docker build -t hdlc/ghdl - < ghdl.dockerfile
 
     - name: TODO test hdlc/pkg:ghdl
-      uses: docker://alpine
-      with:
-        args: ./test/todo.sh
-
-    - uses: docker://hdlc/ghdl
-      with:
-        args: ./test/ghdl.sh
+      run: docker run --rm -v $(pwd):/wrk alpine /wrk/test/todo.sh
+      #uses: docker://alpine
+      #with:
+      #  args: ./test/todo.sh
+
+    - run: docker run --rm -v $(pwd):/wrk hdlc/ghdl /wrk/test/ghdl.sh
+      #uses: docker://hdlc/ghdl
+      #with:
+      #  args: ./test/ghdl.sh
 
     - name: Deploy to DockerHub
       run: |

diff --git a/.github/workflows/gtkwave.yml b/.github/workflows/gtkwave.yml
@@ -26,9 +26,10 @@ jobs:
         docker build -t hdlc/pkg:gtkwave - < gtkwave.dockerfile
 
     - name: TODO test hdlc/pkg:gtkwave
-      uses: docker://alpine
-      with:
-        args: ./test/todo.sh
+      run: docker run --rm -v $(pwd):/wrk alpine /wrk/test/todo.sh
+      #uses: docker://alpine
+      #with:
+      #  args: ./test/todo.sh
 
     - name: Deploy to DockerHub
       run: |

diff --git a/.github/workflows/icestorm.yml b/.github/workflows/icestorm.yml
@@ -27,14 +27,16 @@ jobs:
         docker build -t hdlc/icestorm - < icestorm.dockerfile
 
     - name: TODO test hdlc/pkg:icestorm
-      uses: docker://alpine
-      with:
-        args: ./test/todo.sh
+      run: docker run --rm -v $(pwd):/wrk alpine /wrk/test/todo.sh
+      #uses: docker://alpine
+      #with:
+      #  args: ./test/todo.sh
 
     - name: TODO test hdlc/icestorm
-      uses: docker://hdlc/icestorm
-      with:
-        args: ./test/todo.sh
+      run: docker run --rm -v $(pwd):/wrk hdlc/icestorm /wrk/test/todo.sh
+      #uses: docker://hdlc/icestorm
+      #with:
+      #  args: ./test/todo.sh
 
     - name: Deploy to DockerHub
       run: |

diff --git a/.github/workflows/nextpnr.yml b/.github/workflows/nextpnr.yml
@@ -28,19 +28,22 @@ jobs:
         docker build -t hdlc/nextpnr - < nextpnr.dockerfile
 
     - name: TODO test hdlc/nextpnr:ice40
-      uses: docker://hdlc/nextpnr:ice40
-      with:
-        args: ./test/todo.sh
+      run: docker run --rm -v $(pwd):/wrk hdlc/nextpnr:ice40 /wrk/test/todo.sh
+      #uses: docker://hdlc/nextpnr:ice40
+      #with:
+      #  args: ./test/todo.sh
 
     - name: TODO test hdlc/nextpnr:ecp5
-      uses: docker://hdlc/nextpnr:ecp5
-      with:
-        args: ./test/todo.sh
+      run: docker run --rm -v $(pwd):/wrk hdlc/nextpnr:ecp5 /wrk/test/todo.sh
+      #uses: docker://hdlc/nextpnr:ecp5
+      #with:
+      #  args: ./test/todo.sh
 
     - name: TODO test hdlc/nextpnr
-      uses: docker://hdlc/nextpnr
-      with:
-        args: ./test/todo.sh
+      run: docker run --rm -v $(pwd):/wrk hdlc/nextpnr /wrk/test/todo.sh
+      #uses: docker://hdlc/nextpnr
+      #with:
+      #  args: ./test/todo.sh
 
     - name: Deploy to DockerHub
       run: |

diff --git a/.github/workflows/prjtrellis.yml b/.github/workflows/prjtrellis.yml
@@ -27,14 +27,16 @@ jobs:
         docker build -t hdlc/prjtrellis - < prjtrellis.dockerfile
 
     - name: TODO test hdlc/pkg:prjtrellis
-      uses: docker://alpine
-      with:
-        args: ./test/todo.sh
+      run: docker run --rm -v $(pwd):/wrk alpine /wrk/test/todo.sh
+      #uses: docker://alpine
+      #with:
+      #  args: ./test/todo.sh
 
     - name: TODO test hdlc/prjtrellis
-      uses: docker://hdlc/prjtrellis
-      with:
-        args: ./test/todo.sh
+      run: docker run --rm -v $(pwd):/wrk hdlc/prjtrellis /wrk/test/todo.sh
+      #uses: docker://hdlc/prjtrellis
+      #with:
+      #  args: ./test/todo.sh
 
     - name: Deploy to DockerHub
       run: |

diff --git a/.github/workflows/prog.yml b/.github/workflows/prog.yml
@@ -26,9 +26,10 @@ jobs:
         docker build -t hdlc/prog - < prog.dockerfile
 
     - name: TODO test hdlc/prog
-      uses: docker://hdlc/prog
-      with:
-        args: ./test/todo.sh
+      run: docker run --rm -v $(pwd):/wrk hdlc/prog /wrk/test/todo.sh
+      #uses: docker://hdlc/prog
+      #with:
+      #  args: ./test/todo.sh
 
     - name: Deploy to DockerHub
       run: |

diff --git a/.github/workflows/symbiyosys.yml b/.github/workflows/symbiyosys.yml
@@ -26,9 +26,10 @@ jobs:
         docker build -t hdlc/pkg:symbiyosys - < symbiyosys.dockerfile
 
     - name: TODO test hdlc/pkg:symbiyosys
-      uses: docker://alpine
-      with:
-        args: ./test/todo.sh
+      run: docker run --rm -v $(pwd):/wrk alpine /wrk/test/todo.sh
+      #uses: docker://alpine
+      #with:
+      #  args: ./test/todo.sh
 
     - name: Deploy to DockerHub
       run: |

diff --git a/.github/workflows/yosys.yml b/.github/workflows/yosys.yml
@@ -27,14 +27,16 @@ jobs:
         docker build -t hdlc/yosys - < yosys.dockerfile
 
     - name: TODO test hdlc/pkg:yosys
-      uses: docker://alpine
-      with:
-        args: ./test/todo.sh
+      run: docker run --rm -v $(pwd):/wrk alpine /wrk/test/todo.sh
+      #uses: docker://alpine
+      #with:
+      #  args: ./test/todo.sh
 
     - name: TODO test hdlc/yosys
-      uses: docker://hdlc/yosys
-      with:
-        args: ./test/todo.sh
+      run: docker run --rm -v $(pwd):/wrk hdlc/yosys /wrk/test/todo.sh
+      #uses: docker://hdlc/yosys
+      #with:
+      #  args: ./test/todo.sh
 
     - name: Deploy to DockerHub
       run: |

diff --git a/.github/workflows/z3.yml b/.github/workflows/z3.yml
@@ -26,9 +26,10 @@ jobs:
         docker build -t hdlc/pkg:z3 - < z3.dockerfile
 
     - name: TODO test hdlc/pkg:z3
-      uses: docker://alpine
-      with:
-        args: ./test/todo.sh
+      run: docker run --rm -v $(pwd):/wrk alpine /wrk/test/todo.sh
+      #uses: docker://alpine
+      #with:
+      #  args: ./test/todo.sh
 
     - name: Deploy to hub.docker.com
       run: |