Skip to content

Commit 269a4cb

Browse files
committed
pip
Signed-off-by: Mete Fatih Cırıt <mfc@autoware.org>
1 parent 9417988 commit 269a4cb

File tree

2 files changed

+15
-16
lines changed

2 files changed

+15
-16
lines changed

.github/actions/combine-repos-action/action.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ runs:
1818
- name: Set up Python
1919
uses: actions/setup-python@v5
2020
with:
21-
python-version: '3.x'
21+
python-version: 3.x
2222

2323
- name: Install PyYAML dependency
24-
run: pip install pyyaml
24+
run: pip3 install -U pyyaml
2525
shell: bash
2626

2727
- name: Combine repos files

.github/workflows/build-and-test-differential.yaml

+13-14
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,19 @@ jobs:
4646
ref: ${{ github.event.pull_request.head.sha }}
4747
fetch-depth: ${{ env.PR_FETCH_DEPTH }}
4848

49+
# Prepare build dependency file based on the PR base branch
50+
- name: Prepare build-depends repos file (main branch)
51+
if: ${{ github.event.pull_request.base.ref == 'main' }}
52+
uses: ./.github/actions/combine-repos-action
53+
with:
54+
base_file: build_depends_humble.repos
55+
overlay_file: build_depends_nightly.repos
56+
output_file: build_depends.repos
57+
58+
- name: Prepare build-depends repos file (humble branch)
59+
if: ${{ github.event.pull_request.base.ref == 'humble' }}
60+
run: cp build_depends_humble.repos build_depends.repos
61+
4962
- name: Show disk space before the tasks
5063
run: df -h
5164
shell: bash
@@ -91,20 +104,6 @@ jobs:
91104
echo "BUILD_TYPE_CUDA_STATE=$build_type_cuda_state" >> "${GITHUB_ENV}"
92105
echo "::notice::BUILD_TYPE_CUDA_STATE=$build_type_cuda_state"
93106
shell: bash
94-
95-
# Prepare build dependency file based on the PR base branch
96-
- name: Prepare build-depends repos file (main branch)
97-
if: ${{ github.event.pull_request.base.ref == 'main' }}
98-
uses: ./.github/actions/combine-repos-action
99-
with:
100-
base_file: build_depends_humble.repos
101-
overlay_file: build_depends_nightly.repos
102-
output_file: build_depends.repos
103-
104-
- name: Prepare build-depends repos file (humble branch)
105-
if: ${{ github.event.pull_request.base.ref == 'humble' }}
106-
run: cp build_depends_humble.repos build_depends.repos
107-
108107
- name: Build
109108
if: ${{ steps.get-modified-packages.outputs.modified-packages != '' }}
110109
uses: autowarefoundation/autoware-github-actions/colcon-build@v1

0 commit comments

Comments
 (0)