Skip to content

Commit 0965ae9

Browse files
committed
Fix daily build S3 testing
1 parent a069f54 commit 0965ae9

File tree

6 files changed

+63
-8
lines changed

6 files changed

+63
-8
lines changed

.github/workflows/cmake-ctest.yml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,14 +578,32 @@ jobs:
578578
- name: Install CMake Dependencies (Linux S3)
579579
run: |
580580
sudo apt-get update
581-
sudo apt-get install ninja-build doxygen graphviz
582-
sudo apt install libssl3 libssl-dev libcurl4 libcurl4-openssl-dev
581+
sudo apt-get install ninja-build doxygen
583582
584583
- name: Install CMake
585584
uses: jwlawson/actions-setup-cmake@v2
586585
with:
587586
cmake-version: '3.31.6'
588587

588+
- name: Install aws-c-s3 (Cached installation)
589+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
590+
with:
591+
name: libaws-c-s3-Release
592+
593+
- name: Untar libaws-c-s3 installation
594+
run: |
595+
tar xvf libaws-c-s3.tar -C ${{ runner.workspace }}
596+
597+
- name: List contents of libaws-c-s3 installation
598+
run: |
599+
ls -lR ${{ runner.workspace }}/aws-c-s3-build
600+
601+
- name: Setup environment
602+
shell: bash
603+
run: |
604+
echo "LD_LIBRARY_PATH=${{ runner.workspace }}/aws-c-s3-build/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
605+
echo "CMAKE_PREFIX_PATH=${{ runner.workspace }}/aws-c-s3-build" >> $GITHUB_ENV
606+
589607
- name: Set file base name (Linux S3)
590608
id: set-file-base
591609
run: |

.github/workflows/cmake-script.yml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,14 +365,32 @@ jobs:
365365
- name: Install CMake Dependencies (Linux S3)
366366
run: |
367367
sudo apt-get update
368-
sudo apt-get install ninja-build doxygen graphviz curl
369-
sudo apt install libssl3 libssl-dev libcurl4 libcurl4-openssl-dev
368+
sudo apt-get install ninja-build doxygen
370369
371370
- name: Install CMake
372371
uses: jwlawson/actions-setup-cmake@v2
373372
with:
374373
cmake-version: '3.31.6'
375374

375+
- name: Install aws-c-s3 (Cached installation)
376+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
377+
with:
378+
name: libaws-c-s3-Release
379+
380+
- name: Untar libaws-c-s3 installation
381+
run: |
382+
tar xvf libaws-c-s3.tar -C ${{ runner.workspace }}
383+
384+
- name: List contents of libaws-c-s3 installation
385+
run: |
386+
ls -laR ${{ runner.workspace }}/aws-c-s3-build
387+
388+
- name: Setup environment
389+
shell: bash
390+
run: |
391+
echo "LD_LIBRARY_PATH=${{ runner.workspace }}/aws-c-s3-build/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
392+
echo "CMAKE_PREFIX_PATH=${{ runner.workspace }}/aws-c-s3-build" >> $GITHUB_ENV
393+
376394
- name: Set file base name (Linux S3)
377395
id: set-file-base
378396
run: |

.github/workflows/cmake.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
uses: ./.github/workflows/vfd-ros3.yml
3434
with:
3535
build_mode: "Release"
36+
build_aws_c_s3_only: false
3637
aws_c_s3_build_type: "package"
3738
# Use latest release for building from source on Ubuntu
3839
# until a package is available to install

.github/workflows/daily-build.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,19 @@ jobs:
6666
use_tag: snapshot
6767
use_environ: snapshots
6868

69+
call-aws-c-s3-build:
70+
needs: call-workflow-tarball
71+
name: "Build aws-c-s3 library"
72+
uses: ./.github/workflows/vfd-ros3.yml
73+
with:
74+
build_mode: "Release"
75+
build_aws_c_s3_only: true
76+
aws_c_s3_build_type: "source"
77+
# Use latest release for building from source on Ubuntu
78+
# until a package is available to install
79+
aws_c_s3_tag: "v0.8.0"
80+
if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-old-names.outputs.run-ignore == 'ignore')) }}
81+
6982
call-release-cmake-cygwin:
7083
needs: [get-old-names, call-workflow-tarball]
7184
name: "CMake Cygwin Workflows"
@@ -76,7 +89,7 @@ jobs:
7689
if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-old-names.outputs.run-ignore == 'ignore')) }}
7790

7891
call-workflow-c-script:
79-
needs: [get-old-names, call-workflow-tarball]
92+
needs: [get-old-names, call-workflow-tarball, call-aws-c-s3-build]
8093
uses: ./.github/workflows/cmake-script.yml
8194
with:
8295
file_base: ${{ needs.call-workflow-tarball.outputs.file_base }}
@@ -118,7 +131,7 @@ jobs:
118131
if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-old-names.outputs.run-ignore == 'ignore')) }}
119132

120133
call-workflow-ctest:
121-
needs: [get-old-names, call-workflow-tarball]
134+
needs: [get-old-names, call-workflow-tarball, call-aws-c-s3-build]
122135
uses: ./.github/workflows/cmake-ctest.yml
123136
with:
124137
preset_name: ci-StdShar

.github/workflows/vfd-main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ jobs:
4141
uses: ./.github/workflows/vfd-ros3.yml
4242
with:
4343
build_mode: "${{ inputs.build_mode }}"
44+
build_aws_c_s3_only: false
4445
aws_c_s3_build_type: "source"
4546
aws_c_s3_tag: "main"
4647

.github/workflows/vfd-ros3.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77
description: "CMake build type (CMAKE_BUILD_TYPE)"
88
required: true
99
type: string
10+
build_aws_c_s3_only:
11+
description: "Only build the aws-c-s3 library without performing other actions"
12+
required: true
13+
type: boolean
1014
aws_c_s3_build_type:
1115
description: "Install aws-c-s3 from a package manager ('package') or build from source ('source')"
1216
required: true
@@ -240,7 +244,7 @@ jobs:
240244
if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
241245

242246
build_from_package_managers:
243-
if: ${{ inputs.aws_c_s3_build_type == 'package' }}
247+
if: ${{ inputs.aws_c_s3_build_type == 'package' && ! inputs.build_aws_c_s3_only }}
244248

245249
# Ubuntu doesn't have a package for aws-c-s3 yet, so use a
246250
# built from source version until then
@@ -382,7 +386,7 @@ jobs:
382386
# Build and test the ROS3 VFD using aws-c-s3 built from source,
383387
# currently only on Ubuntu.
384388
build_and_test_vfd:
385-
if: ${{ inputs.aws_c_s3_build_type == 'source' }}
389+
if: ${{ inputs.aws_c_s3_build_type == 'source' && ! inputs.build_aws_c_s3_only }}
386390

387391
needs: build_aws_c_s3
388392

0 commit comments

Comments
 (0)