From f7d1b236660bd5f57cad1889e950498346d8a0a3 Mon Sep 17 00:00:00 2001 From: "Lucas, John P" Date: Wed, 12 Jun 2024 22:14:48 -0400 Subject: [PATCH 1/9] [nasa/nos3#216] First attempt at build workflow; --- .github/workflows/build.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 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..ad525424 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,22 @@ +name: Build + +on: + push: + branches: [ main, dev ] + pull_request: + branches: [ main, dev ] + +jobs: + fsw: + # Container setup + runs-on: ubuntu-latest + container: + image: ivvitc/nos3-64:dev + steps: + - uses: actions/checkout@v2 + - name: Update + run: sudo apt-get update + - name: Install dependencies + run: sudo apt-get install -y python3 + - name: fsw + run: make config fsw From e814e588c24b49f6dffc9e8937c054e3e15a1973 Mon Sep 17 00:00:00 2001 From: "Lucas, John P" Date: Wed, 12 Jun 2024 22:20:59 -0400 Subject: [PATCH 2/9] [nasa/nos3#216] Removed specific branches from build workflow; --- .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 ad525424..9b7aa8f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,9 +2,7 @@ name: Build on: push: - branches: [ main, dev ] pull_request: - branches: [ main, dev ] jobs: fsw: @@ -14,6 +12,8 @@ jobs: image: ivvitc/nos3-64:dev steps: - uses: actions/checkout@v2 + with: + submodules: 'true' - name: Update run: sudo apt-get update - name: Install dependencies From af33f35e5f87104753396002658ab1874d90fdbd Mon Sep 17 00:00:00 2001 From: "Lucas, John P" Date: Wed, 12 Jun 2024 22:27:47 -0400 Subject: [PATCH 3/9] [nasa/nos3#216] Removed sudo and added make prep; --- .github/workflows/build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b7aa8f6..df4b6924 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,8 +15,10 @@ jobs: with: submodules: 'true' - name: Update - run: sudo apt-get update + run: apt-get update - name: Install dependencies - run: sudo apt-get install -y python3 + run: apt-get install -y python3 + - name: prep + run: make prep - name: fsw run: make config fsw From 31177bef394793b9c58f393b853d22bc15b56cfe Mon Sep 17 00:00:00 2001 From: "Lucas, John P" Date: Wed, 12 Jun 2024 22:36:10 -0400 Subject: [PATCH 4/9] [nasa/nos3#216] Added missing docker dependency; --- .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 df4b6924..e9852f41 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: - name: Update run: apt-get update - name: Install dependencies - run: apt-get install -y python3 + run: apt-get install -y python3 docker docker.io - name: prep run: make prep - name: fsw From b217828f2d415112ca633eedcf5e41ce2427f035 Mon Sep 17 00:00:00 2001 From: "Lucas, John P" Date: Thu, 13 Jun 2024 07:07:05 -0400 Subject: [PATCH 5/9] [nasa/nos3#216] Break config and fsw into different runs in build.yml; --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e9852f41..9402bbc5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,5 +20,7 @@ jobs: run: apt-get install -y python3 docker docker.io - name: prep run: make prep + - name: config + run: make config - name: fsw - run: make config fsw + run: make fsw From 0a22ebf91562c0741ad0dcabf390802165c616bc Mon Sep 17 00:00:00 2001 From: "Lucas, John P" Date: Thu, 13 Jun 2024 07:48:06 -0400 Subject: [PATCH 6/9] [nasa/nos3#216] Avoid docker in docker and run build-fsw; --- .github/workflows/build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9402bbc5..9944d148 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,5 +22,7 @@ jobs: run: make prep - name: config run: make config - - name: fsw - run: make fsw + - name: build directory + run: mkdir ./fsw/build + - name: build + run: make build-fsw From f3354eaee67be321c7998e536efcda5f4070254d Mon Sep 17 00:00:00 2001 From: "Lucas, John P" Date: Thu, 13 Jun 2024 07:59:50 -0400 Subject: [PATCH 7/9] [nasa/nos3#216] Attempt to get submodules recursively; --- .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 9944d148..281a20bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - submodules: 'true' + submodules: recursive - name: Update run: apt-get update - name: Install dependencies From 2590cd2de7b9ac16ccea0ce4ff9c2d4bb5927ba8 Mon Sep 17 00:00:00 2001 From: "Lucas, John P" Date: Thu, 13 Jun 2024 08:43:47 -0400 Subject: [PATCH 8/9] [nasa/nos3#216] Added sim job to build workflow; --- .github/workflows/build.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 281a20bb..ad87a311 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,6 @@ on: jobs: fsw: - # Container setup runs-on: ubuntu-latest container: image: ivvitc/nos3-64:dev @@ -26,3 +25,24 @@ jobs: run: mkdir ./fsw/build - name: build run: make build-fsw + + sim: + runs-on: ubuntu-latest + container: + image: ivvitc/nos3-64:dev + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + - name: Update + run: apt-get update + - name: Install dependencies + run: apt-get install -y python3 docker docker.io + - name: prep + run: make prep + - name: config + run: make config + - name: build directory + run: mkdir ./sims/build + - name: build + run: make build-sim From 370022720533b84d07483a688c5efeabdfc9eda1 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Thu, 13 Jun 2024 19:41:15 -0400 Subject: [PATCH 9/9] [nasa/nos3#216] Attempt to use checkout@v4; --- .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 ad87a311..28419fdf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: container: image: ivvitc/nos3-64:dev steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: recursive - name: Update