add GitHub action; code/comment cosmetics

2026-04-05 05:51:14 +00:00 · 2022-04-17 19:37:26 +02:00
parent 6b8c0633bc
commit 0c3d853a2b
10 changed files with 86 additions and 14 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,75 @@
+# $Id: ci.yml 1220 2022-04-17 16:41:28Z mueller $
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright 2022- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
+
+name: ci
+on: [push,workflow_dispatch]
+jobs:
+  ci:
+    runs-on: ubuntu-20.04
+    env:
+      CC: gcc
+      CXX: g++
+    steps:
+    - uses: actions/checkout@v3
+    - name: install
+      run: |
+        sudo apt-get install -y \
+          libusb-1.0-0-dev \
+          tcl8.6 tcl8.6-dev tcllib tclreadline \
+          libyaml-libyaml-perl
+    - name: get-allsim
+      run: |
+        wget -nv https://www.retro11.de/data/oc_w11/travis/allsim.tgz
+        tar -tvf allsim.tgz | perl -pe 's/^.*\s(\d\d\d\d-)/$1/'
+        tar -xvf allsim.tgz && rm allsim.tgz
+    - name: info
+      run: |
+        lscpu
+        lsb_release -d
+        bash -c '${CC}  --version'
+        bash -c '${CXX} --version'
+        printenv | grep ^GITHUB_ | sort
+    - name: build
+      run: |
+        export RETROBASE=$PWD
+        export PATH=$PATH:$RETROBASE/tools/bin:.
+        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RETROBASE/tools/lib
+        export BOOSTINC=/usr/include
+        export BOOSTLIB=/usr/lib
+        export TCLINC=/usr/include/tcl8.6
+        export TCLLIB=/usr/lib/x86_64-linux-gnu
+        export TCLLIBNAME=tcl8.6
+        make -j 2 -C tools/src
+        make -j 2 -C tools/src/testtclsh
+        make all_tcl
+        make -C tools/asm-11/tests allexp
+        make -C tools/asm-11/tests-err allexp
+        make -C tools/mcode all
+    - name: test
+      run: |
+        export RETROBASE=$PWD
+        export PATH=$PATH:$RETROBASE/tools/bin:.
+        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RETROBASE/tools/lib
+        tbrun -j 2 -nomake \
+          -tag memlib \
+          -tag genlib \
+          -tag comlib \
+          -tag rlink \
+          -tag serport \
+          -tag bplib \
+          -tag mig \
+          -tag w11a \
+          -tag sys_tst_serloop \
+          -tag sys_tst_serloop1 \
+          -tag sys_tst_serloop2 \
+          -tag sys_tst_rlink,base \
+          -tag sys_tst_rlink_cuff,basefx2 \
+          -tag sys_tst_mig,base \
+          -tag sys_tst_sram,base \
+          -tag sys_tst_sram,n4 \
+          -tag sys_tst_sram,arty \
+          -tag sys_w11a,stim1 \
+          -tag sys_w11a,n4 \
+          -tag sys_w11a,arty
+        tbfilt -all -sum -comp
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # w11: PDP 11/70 CPU and SoC

-[![Build Status](https://travis-ci.org/wfjm/w11.svg?branch=master)](https://travis-ci.org/wfjm/w11)
+[![ci](https://github.com/wfjm/w11/actions/workflows/ci.yml/badge.svg)](https://github.com/wfjm/w11/actions/workflows/ci.yml)
 [![Coverity Status](https://scan.coverity.com/projects/16546/badge.svg?flat=1)](https://scan.coverity.com/projects/wfjm-w11)
 [![Commits since latest release](https://img.shields.io/github/commits-since/wfjm/w11/latest.svg?longCache=true)](https://github.com/wfjm/w11/releases)

--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -26,6 +26,7 @@ The full set of tests is only run for tagged releases.

 ### Summary
 - drop Travis (now defunct)
+- add preliminary GitHub Actions support
 - use vivado 2020.1 as default
 - use std=c++17 (requires gcc 7.3 or later)
 - automate oskit download and container file setup
--- a/rtl/bplib/arty/tb/tb_arty.vhd
+++ b/rtl/bplib/arty/tb/tb_arty.vhd
@@ -1,4 +1,4 @@
-- $Id: tb_arty.vhd 1181 2019-07-08 17:00:50Z mueller $
+-- $Id: tb_arty.vhd 1211 2021-08-28 11:20:34Z mueller $
 -- SPDX-License-Identifier: GPL-3.0-or-later
 -- Copyright 2016-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 -- 
@@ -10,7 +10,7 @@
 --                 simlib/simclkcnt
 --                 rlink/tbcore/tbcore_rlink
 --                 xlib/sfs_gsim_core
--                 tb_basys3_core
+--                 tb_arty_core
 --                 serport/tb/serport_master_tb
 --                 arty_aif [UUT]
 --
--- a/rtl/sys_gen/w11a/arty/sys_w11a_arty.vhd
+++ b/rtl/sys_gen/w11a/arty/sys_w11a_arty.vhd
@@ -1,4 +1,4 @@
-- $Id: sys_w11a_arty.vhd 1181 2019-07-08 17:00:50Z mueller $
+-- $Id: sys_w11a_arty.vhd 1211 2021-08-28 11:20:34Z mueller $
 -- SPDX-License-Identifier: GPL-3.0-or-later
 -- Copyright 2018-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -169,7 +169,6 @@ architecture syn of sys_w11a_arty is
  signal RB_MREQ        : rb_mreq_type := rb_mreq_init;
  signal RB_SRES        : rb_sres_type := rb_sres_init;
  signal RB_SRES_CPU    : rb_sres_type := rb_sres_init;
-  signal RB_SRES_HIO    : rb_sres_type := rb_sres_init;
  signal RB_SRES_SYSMON : rb_sres_type := rb_sres_init;
  signal RB_SRES_USRACC : rb_sres_type := rb_sres_init;

--- a/rtl/sys_gen/w11a/arty_bram/sys_w11a_br_arty.vhd
+++ b/rtl/sys_gen/w11a/arty_bram/sys_w11a_br_arty.vhd
@@ -1,4 +1,4 @@
-- $Id: sys_w11a_br_arty.vhd 1181 2019-07-08 17:00:50Z mueller $
+-- $Id: sys_w11a_br_arty.vhd 1211 2021-08-28 11:20:34Z mueller $
 -- SPDX-License-Identifier: GPL-3.0-or-later
 -- Copyright 2016-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -153,7 +153,6 @@ architecture syn of sys_w11a_br_arty is
  signal RB_MREQ        : rb_mreq_type := rb_mreq_init;
  signal RB_SRES        : rb_sres_type := rb_sres_init;
  signal RB_SRES_CPU    : rb_sres_type := rb_sres_init;
-  signal RB_SRES_HIO    : rb_sres_type := rb_sres_init;
  signal RB_SRES_SYSMON : rb_sres_type := rb_sres_init;
  signal RB_SRES_USRACC : rb_sres_type := rb_sres_init;

--- a/rtl/sys_gen/w11a/artys7/sys_w11a_as7.vhd
+++ b/rtl/sys_gen/w11a/artys7/sys_w11a_as7.vhd
@@ -1,4 +1,4 @@
-- $Id: sys_w11a_as7.vhd 1181 2019-07-08 17:00:50Z mueller $
+-- $Id: sys_w11a_as7.vhd 1211 2021-08-28 11:20:34Z mueller $
 -- SPDX-License-Identifier: GPL-3.0-or-later
 -- Copyright 2019- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -155,7 +155,6 @@ architecture syn of sys_w11a_as7 is
  signal RB_MREQ        : rb_mreq_type := rb_mreq_init;
  signal RB_SRES        : rb_sres_type := rb_sres_init;
  signal RB_SRES_CPU    : rb_sres_type := rb_sres_init;
-  signal RB_SRES_HIO    : rb_sres_type := rb_sres_init;
  signal RB_SRES_SYSMON : rb_sres_type := rb_sres_init;
  signal RB_SRES_USRACC : rb_sres_type := rb_sres_init;

--- a/rtl/sys_gen/w11a/artys7_bram/sys_w11a_br_as7.vhd
+++ b/rtl/sys_gen/w11a/artys7_bram/sys_w11a_br_as7.vhd
@@ -1,4 +1,4 @@
-- $Id: sys_w11a_br_as7.vhd 1181 2019-07-08 17:00:50Z mueller $
+-- $Id: sys_w11a_br_as7.vhd 1211 2021-08-28 11:20:34Z mueller $
 -- SPDX-License-Identifier: GPL-3.0-or-later
 -- Copyright 2018-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -131,7 +131,6 @@ architecture syn of sys_w11a_br_as7 is
  signal RB_MREQ        : rb_mreq_type := rb_mreq_init;
  signal RB_SRES        : rb_sres_type := rb_sres_init;
  signal RB_SRES_CPU    : rb_sres_type := rb_sres_init;
-  signal RB_SRES_HIO    : rb_sres_type := rb_sres_init;
  signal RB_SRES_SYSMON : rb_sres_type := rb_sres_init;
  signal RB_SRES_USRACC : rb_sres_type := rb_sres_init;

--- a/rtl/sys_gen/w11a/cmoda7/sys_w11a_c7.vhd
+++ b/rtl/sys_gen/w11a/cmoda7/sys_w11a_c7.vhd
@@ -1,4 +1,4 @@
-- $Id: sys_w11a_c7.vhd 1181 2019-07-08 17:00:50Z mueller $
+-- $Id: sys_w11a_c7.vhd 1211 2021-08-28 11:20:34Z mueller $
 -- SPDX-License-Identifier: GPL-3.0-or-later
 -- Copyright 2017-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --
@@ -15,7 +15,7 @@
 --                 w11a/pdp11_bram_memctl
 --                 bplib/fx2rlink/ioleds_sp1c
 --                 w11a/pdp11_hio70
--                 bplib/bpgen/sn_humanio_eum_rbus
+--                 bplib/bpgen/sn_humanio_emu_rbus
 --                 bplib/sysmon/sysmonx_rbus_base
 --                 vlib/rbus/rbd_usracc
 --                 vlib/rbus/rb_sres_or_4
--- a/rtl/vlib/simlib/simlib.vhd
+++ b/rtl/vlib/simlib/simlib.vhd
@@ -1,4 +1,4 @@
-- $Id: simlib.vhd 1202 2019-08-13 17:23:16Z mueller $
+-- $Id: simlib.vhd 1210 2021-08-26 13:27:26Z mueller $
 -- SPDX-License-Identifier: GPL-3.0-or-later
 -- Copyright 2006-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 --