Skip to content

Commit

Permalink
fixed outdated var and moved fatimage to bumped branch
Browse files Browse the repository at this point in the history
  • Loading branch information
wtripp180901 committed Dec 20, 2024
1 parent 94b5eef commit 0863a9a
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 3 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/fatimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ on:
ci_cloud:
type: string
default: LEAFCLOUD
branch:
type: string
default: "${{ github.ref }}"
outputs:
openhpc-RL8-image:
description: "RL8 image"
Expand Down Expand Up @@ -51,7 +54,20 @@ jobs:
openhpc-RL9-image: "${{ steps.manifest.outputs.openhpc-RL9-image }}"

steps:

- name: Get current context
id: get_branch
run: |
if [[ ${{ github.event_name == 'workflow_dispatch' }} == true ]]; then
target_branch=${{ github.ref }}
else
target_branch=${{ github.event.inputs.branch }}
fi
echo "target_branch=$target_branch" >> "$GITHUB_OUTPUT"
- uses: actions/checkout@v2
with:
ref: ${{ steps.get_branch.outputs.target_branch }}

- name: Record settings for CI cloud
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-timestamps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with: #temporary
ref: feat/auto-bump-timestamps #temporary

- name: Check for updated Ark timestamps and replace in defaults.yml
run: |
Expand Down Expand Up @@ -45,6 +43,8 @@ jobs:
if: "${{ needs.upstream_check.outputs.timestamps_changed }} == 0"
needs: upstream_check
uses: ./.github/workflows/fatimage.yml
with:
ci_cloud: LEAFCLOUD

ci_and_pr:
if: "${{ needs.upstream_check.outputs.timestamps_changed }} == 0"
Expand Down
2 changes: 1 addition & 1 deletion ansible/ci/update_timestamps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
{{ yaml_template | to_nice_yaml(indent=2) }}
vars:
yaml_template:
appliances_repo_timestamps: "{{ _result.latest_dict }}"
appliances_pulp_repos: "{{ _result.latest_dict }}"
when: (_result.changed_timestamps | count) > 0

0 comments on commit 0863a9a

Please sign in to comment.