From 713c811cd4d2a0ebdf1cee1ab65e1fc8bafef712 Mon Sep 17 00:00:00 2001 From: Alex Foster <123afoster@gmail.com> Date: Wed, 27 Oct 2021 18:06:58 -0700 Subject: [PATCH 01/15] add build file --- .github/workflows/build.yml | 94 +++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..5a59c065 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,94 @@ +name: build + +on: + push: + branches: + - main + - newci + pull_request: + branches: [ main ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Set GDL Dir + run: mkdir gdl && cd gdl + + - name: Get GDL + uses: actions/checkout@v2 + with: + repository: no-lex/idl2src + + - name: Get GDL + uses: actions/checkout@v2 + with: + repository: gnudatalanguage/gdl + + - name: Build GDL + run: | + sed -i 's/\/\/#define GDL_DEBUG/#define GDL_DEBUG/g' src/dinterpreter.cpp + scripts/build_gdl.sh prep + scripts/build_gdl.sh configure + scripts/build_gdl.sh build + scripts/build_gdl.sh install + chmod 777 build/src/gdl + + - name: Upload GDL binary + uses: actions/upload-artifact@v2 + with: + name: gdl + path: ./build/src/gdl + + - name: Get idl2src + uses: actions/checkout@v2 + with: + repository: no-lex/idl2src + + - name: make + run: make + + - name: Upload binary artifact + uses: actions/upload-artifact@v2 + with: + name: idl2src + path: | + ./idl2src + ./run_indexer.sh + ./ci_script.sh + + - name: Get FHD + uses: actions/checkout@v2 + with: + repository: EoRImaging/FHD + + - name: Get idl2src binary + uses: actions/download-artifact@v2 + with: + name: idl2src + + - name: Get gdl binary + uses: actions/download-artifact@v2 + with: + name: gdl + + - name: Build Database + run: | + chmod 777 idl2src + chmod 777 gdl + chmod 777 ci_script.sh + chmod 777 run_indexer.sh + ./ci_script.sh + ls + + - name: Upload database artifact + uses: actions/upload-artifact@v2 + with: + name: FHD + path: | + ./FHD.srctrldb + ./FHD.srctrlprj From b7f4a202d50c3b8d7cfb4183f0907fb8b95eff67 Mon Sep 17 00:00:00 2001 From: Alex Foster <123afoster@gmail.com> Date: Wed, 27 Oct 2021 18:08:31 -0700 Subject: [PATCH 02/15] set branch to run GH Actions ci on --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5a59c065..c54390c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: push: branches: - main - - newci + - idl2src-ci pull_request: branches: [ main ] From c4daa357b8ba3d404580237491b38bda8e6d9483 Mon Sep 17 00:00:00 2001 From: Alex Foster <123afoster@gmail.com> Date: Wed, 27 Oct 2021 18:55:39 -0700 Subject: [PATCH 03/15] pull artifacts from idl2src repo --- .github/workflows/build.yml | 65 ++++++++----------------------------- 1 file changed, 14 insertions(+), 51 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c54390c9..0d6c3368 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,10 +3,10 @@ name: build on: push: branches: - - main + - master - idl2src-ci pull_request: - branches: [ main ] + branches: [ master ] jobs: build: @@ -16,66 +16,29 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set GDL Dir - run: mkdir gdl && cd gdl - - - name: Get GDL - uses: actions/checkout@v2 - with: - repository: no-lex/idl2src - - - name: Get GDL - uses: actions/checkout@v2 - with: - repository: gnudatalanguage/gdl - - - name: Build GDL - run: | - sed -i 's/\/\/#define GDL_DEBUG/#define GDL_DEBUG/g' src/dinterpreter.cpp - scripts/build_gdl.sh prep - scripts/build_gdl.sh configure - scripts/build_gdl.sh build - scripts/build_gdl.sh install - chmod 777 build/src/gdl - - - name: Upload GDL binary - uses: actions/upload-artifact@v2 + - name: Download gdl artifact + uses: dawidd6/action-download-artifact@v2.14.1 with: + workflow: msbuild.yml name: gdl - path: ./build/src/gdl - - - name: Get idl2src - uses: actions/checkout@v2 - with: - repository: no-lex/idl2src - - - name: make - run: make + path: ./ + repo: no-lex/idl2src + branch: main - - name: Upload binary artifact - uses: actions/upload-artifact@v2 + - name: Download idl2src artifact + uses: dawidd6/action-download-artifact@v2.14.1 with: + workflow: msbuild.yml name: idl2src - path: | - ./idl2src - ./run_indexer.sh - ./ci_script.sh + path: ./ + repo: no-lex/idl2src + branch: main - name: Get FHD uses: actions/checkout@v2 with: repository: EoRImaging/FHD - - name: Get idl2src binary - uses: actions/download-artifact@v2 - with: - name: idl2src - - - name: Get gdl binary - uses: actions/download-artifact@v2 - with: - name: gdl - - name: Build Database run: | chmod 777 idl2src From 1b512f40f9965cf2309e380267c6f881ec9ca71e Mon Sep 17 00:00:00 2001 From: Alex Foster <123afoster@gmail.com> Date: Wed, 27 Oct 2021 19:09:54 -0700 Subject: [PATCH 04/15] correct workflow file name in actions --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d6c3368..6f20e4f7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: - name: Download gdl artifact uses: dawidd6/action-download-artifact@v2.14.1 with: - workflow: msbuild.yml + workflow: build.yml name: gdl path: ./ repo: no-lex/idl2src @@ -28,7 +28,7 @@ jobs: - name: Download idl2src artifact uses: dawidd6/action-download-artifact@v2.14.1 with: - workflow: msbuild.yml + workflow: build.yml name: idl2src path: ./ repo: no-lex/idl2src From 1dd689ed7019538e424f2e10ffdc587a3f22f47a Mon Sep 17 00:00:00 2001 From: Alex Foster <123afoster@gmail.com> Date: Wed, 27 Oct 2021 19:11:50 -0700 Subject: [PATCH 05/15] move FHD get to top of ci workflow --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f20e4f7..07a33254 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,6 +16,11 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Get FHD + uses: actions/checkout@v2 + with: + repository: EoRImaging/FHD + - name: Download gdl artifact uses: dawidd6/action-download-artifact@v2.14.1 with: @@ -34,11 +39,6 @@ jobs: repo: no-lex/idl2src branch: main - - name: Get FHD - uses: actions/checkout@v2 - with: - repository: EoRImaging/FHD - - name: Build Database run: | chmod 777 idl2src From 5280c80a92ac354cd753f4859a34405ed8946496 Mon Sep 17 00:00:00 2001 From: Alex Foster <123afoster@gmail.com> Date: Wed, 27 Oct 2021 19:17:49 -0700 Subject: [PATCH 06/15] add gdl deps to install with apt --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 07a33254..ab43971f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,6 +13,12 @@ jobs: runs-on: ubuntu-latest + - name: Update package list + run: sudo apt-get update + + - name: Install dependencies + run: sudo apt-get install libplplot17 libreadline8 ncurses zlibc + steps: - uses: actions/checkout@v2 From 6d845b9fbfcc233065902a680ea014e3ca2261a9 Mon Sep 17 00:00:00 2001 From: Alex Foster <123afoster@gmail.com> Date: Wed, 27 Oct 2021 19:20:02 -0700 Subject: [PATCH 07/15] fix build.yml steps declaration --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ab43971f..2f0a270f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,15 +13,15 @@ jobs: runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Update package list run: sudo apt-get update - name: Install dependencies run: sudo apt-get install libplplot17 libreadline8 ncurses zlibc - steps: - - uses: actions/checkout@v2 - - name: Get FHD uses: actions/checkout@v2 with: From 575e224332b44e8c9cd108810c1335a40b1082cd Mon Sep 17 00:00:00 2001 From: Alex Foster <123afoster@gmail.com> Date: Wed, 27 Oct 2021 19:21:39 -0700 Subject: [PATCH 08/15] install libncurses6 instead of ncurses in ci --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2f0a270f..bf1c1ee6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: run: sudo apt-get update - name: Install dependencies - run: sudo apt-get install libplplot17 libreadline8 ncurses zlibc + run: sudo apt-get install libplplot17 libreadline8 libncurses6 zlibc - name: Get FHD uses: actions/checkout@v2 From f8a9b5dca3fe0b4fbbeccd4f5c36262dd4002ae0 Mon Sep 17 00:00:00 2001 From: Alex Foster <123afoster@gmail.com> Date: Wed, 27 Oct 2021 19:23:47 -0700 Subject: [PATCH 09/15] use libplplotcxx instead of libplplot --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bf1c1ee6..675e618c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: run: sudo apt-get update - name: Install dependencies - run: sudo apt-get install libplplot17 libreadline8 libncurses6 zlibc + run: sudo apt-get install libplplotcxx15 libreadline8 libncurses6 zlibc - name: Get FHD uses: actions/checkout@v2 From 3162dc1a920cff36dc52ba3f1fc44c0ba6594f11 Mon Sep 17 00:00:00 2001 From: Alex Foster <123afoster@gmail.com> Date: Wed, 27 Oct 2021 19:27:53 -0700 Subject: [PATCH 10/15] add graphicsmagick dep to ci build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 675e618c..1d9ec034 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: run: sudo apt-get update - name: Install dependencies - run: sudo apt-get install libplplotcxx15 libreadline8 libncurses6 zlibc + run: sudo apt-get install libplplotcxx15 libreadline8 libgraphicsmagick++-q16-12 libncurses6 zlibc - name: Get FHD uses: actions/checkout@v2 From cd570f129c7762b95bcca3179eafa5c406d48f79 Mon Sep 17 00:00:00 2001 From: Alex Foster <123afoster@gmail.com> Date: Wed, 27 Oct 2021 20:02:08 -0700 Subject: [PATCH 11/15] install gdl from apt to get all deps in ci --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1d9ec034..04e4b52e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: run: sudo apt-get update - name: Install dependencies - run: sudo apt-get install libplplotcxx15 libreadline8 libgraphicsmagick++-q16-12 libncurses6 zlibc + run: sudo apt-get install gnudatalanguage - name: Get FHD uses: actions/checkout@v2 From b41b68d6e910ea5d7f52ae111f553eddbe3835a5 Mon Sep 17 00:00:00 2001 From: Alex Foster <123afoster@gmail.com> Date: Mon, 1 Nov 2021 12:53:27 -0700 Subject: [PATCH 12/15] add Sourcetrail to readme document --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5983a5fc..5aa33bd6 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ For further details, please see [Sullivan et al 2012](https://arxiv.org/abs/1209 * [Outputs](https://github.com/EoRImaging/FHD/blob/master/outputs.md): For documentation of the various outputs, see the outputs page. * [Inputs](https://github.com/EoRImaging/FHD/blob/master/inputs.md): FHD inputs beam models, calibration files, and sky model catalogs. Currently available inputs are described on this page. * [Publications](https://github.com/EoRImaging/FHD/blob/master/publications.md): FHD has been used in a variety of publications, documented on this page. - +* [Sourcetrail](https://github.com/EoRImaging/FHD/actions): FHD's GitHub Actions generates a Sourcetrail database: just unpack the FHD artifact in the link and open it with [Sourcetrail](https://github.com/CoatiSoftware/Sourcetrail) for convenient, interactive visualization. ## Installation Download the latest versions of these libraries/repos. a. This repository From 4836daae2cdf199111c9f3d0639843af907b2455 Mon Sep 17 00:00:00 2001 From: Alex Foster <123afoster@gmail.com> Date: Mon, 1 Nov 2021 12:57:45 -0700 Subject: [PATCH 13/15] fix grammar in Sourcetrail mention in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5aa33bd6..6b502031 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ For further details, please see [Sullivan et al 2012](https://arxiv.org/abs/1209 * [Outputs](https://github.com/EoRImaging/FHD/blob/master/outputs.md): For documentation of the various outputs, see the outputs page. * [Inputs](https://github.com/EoRImaging/FHD/blob/master/inputs.md): FHD inputs beam models, calibration files, and sky model catalogs. Currently available inputs are described on this page. * [Publications](https://github.com/EoRImaging/FHD/blob/master/publications.md): FHD has been used in a variety of publications, documented on this page. -* [Sourcetrail](https://github.com/EoRImaging/FHD/actions): FHD's GitHub Actions generates a Sourcetrail database: just unpack the FHD artifact in the link and open it with [Sourcetrail](https://github.com/CoatiSoftware/Sourcetrail) for convenient, interactive visualization. +* [Sourcetrail](https://github.com/EoRImaging/FHD/actions): FHD's GitHub Actions generates a Sourcetrail database; just unpack the FHD artifact in the link and open it with [Sourcetrail](https://github.com/CoatiSoftware/Sourcetrail) for convenient, interactive visualization. ## Installation Download the latest versions of these libraries/repos. a. This repository From 91f010aaca267a49c22b6ef48245770cb8156d6b Mon Sep 17 00:00:00 2001 From: Alex Foster <123afoster@gmail.com> Date: Mon, 1 Nov 2021 13:04:57 -0700 Subject: [PATCH 14/15] pad docs section with newline in readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6b502031..e35ee2d7 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ For further details, please see [Sullivan et al 2012](https://arxiv.org/abs/1209 * [Inputs](https://github.com/EoRImaging/FHD/blob/master/inputs.md): FHD inputs beam models, calibration files, and sky model catalogs. Currently available inputs are described on this page. * [Publications](https://github.com/EoRImaging/FHD/blob/master/publications.md): FHD has been used in a variety of publications, documented on this page. * [Sourcetrail](https://github.com/EoRImaging/FHD/actions): FHD's GitHub Actions generates a Sourcetrail database; just unpack the FHD artifact in the link and open it with [Sourcetrail](https://github.com/CoatiSoftware/Sourcetrail) for convenient, interactive visualization. + ## Installation Download the latest versions of these libraries/repos. a. This repository From 47e4ac44c0c6a3cf91d823b0d7fa3e261674144a Mon Sep 17 00:00:00 2001 From: Alex Foster <123afoster@gmail.com> Date: Mon, 8 Nov 2021 12:56:50 -0800 Subject: [PATCH 15/15] use less generic build name for srctrldb gen --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 04e4b52e..6668b69b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: build +name: SourcetrailDB on: push: