File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 4747 echo "CNVM_STACK_NAME=cnvm-stack-pr${{ github.event.number }}-$suffix" >> $GITHUB_ENV
4848
4949 - name : Set up Python
50+ <<<<<<< HEAD
5051 uses : actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
52+ =======
53+ uses : actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
54+ >>>>>>> 5ffe1a83 (Bump actions/setup-python from 5.5.0 to 5.6.0 in /.github/workflows (#3256))
5155 with :
5256 python-version : ' 3.9'
5357
Original file line number Diff line number Diff line change 3434 run : ./bin/hermit env -r >> $GITHUB_ENV
3535
3636 - name : Set up Python
37+ <<<<<<< HEAD
3738 uses : actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
39+ =======
40+ uses : actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
41+ >>>>>>> 5ffe1a83 (Bump actions/setup-python from 5.5.0 to 5.6.0 in /.github/workflows (#3256))
3842 with :
3943 python-version : " 3.9"
4044
Original file line number Diff line number Diff line change @@ -265,7 +265,11 @@ jobs:
265265 echo "AGENTLESS=$agentless_flag" >> $GITHUB_ENV
266266
267267 - name : Set up Python
268+ <<<<<<< HEAD
268269 uses : actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
270+ =======
271+ uses : actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
272+ >>>>>>> 5ffe1a83 (Bump actions/setup-python from 5.5.0 to 5.6.0 in /.github/workflows (#3256))
269273 with :
270274 python-version : " 3.9"
271275
Original file line number Diff line number Diff line change 5151 run : ./bin/hermit env -r >> $GITHUB_ENV
5252
5353 - name : Set up Python
54+ <<<<<<< HEAD
5455 uses : actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
56+ =======
57+ uses : actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
58+ >>>>>>> 5ffe1a83 (Bump actions/setup-python from 5.5.0 to 5.6.0 in /.github/workflows (#3256))
5559 with :
5660 python-version : " 3.9"
5761
@@ -153,7 +157,11 @@ jobs:
153157 run : ./bin/hermit env -r >> $GITHUB_ENV
154158
155159 - name : Set up Python
160+ <<<<<<< HEAD
156161 uses : actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
162+ =======
163+ uses : actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
164+ >>>>>>> 5ffe1a83 (Bump actions/setup-python from 5.5.0 to 5.6.0 in /.github/workflows (#3256))
157165 with :
158166 python-version : " 3.9"
159167
Original file line number Diff line number Diff line change @@ -106,7 +106,11 @@ jobs:
106106 working-directory : ./
107107
108108 - name : Set up Python
109+ <<<<<<< HEAD
109110 uses : actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
111+ =======
112+ uses : actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
113+ >>>>>>> 5ffe1a83 (Bump actions/setup-python from 5.5.0 to 5.6.0 in /.github/workflows (#3256))
110114 with :
111115 python-version : ' 3.9'
112116
You can’t perform that action at this time.
0 commit comments