Skip to content

Revert 7934 es/remove tj changes #8611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alvicsam merged 3 commits into from
May 22, 2025
Merged

Revert 7934 es/remove tj changes #8611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb8aa45
Revert "remove compromised action (#7934)"
pepoviola May 22, 2025
7321b7c
update action to commit of v46.0.5
pepoviola May 22, 2025
3c4a89d
Merge branch 'master' into revert-7934-es/remove-tj-changes
alvicsam May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions .github/workflows/reusable-preflight.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ jobs:
preflight:
runs-on: ubuntu-latest
outputs:
changes_rust: true
changes_currentWorkflow: true
changes_rust: ${{ steps.set_changes.outputs.rust_any_changed || steps.set_changes.outputs.currentWorkflow_any_changed }}
changes_currentWorkflow: ${{ steps.set_changes.outputs.currentWorkflow_any_changed }}

IMAGE: ${{ steps.set_image.outputs.IMAGE }}

Expand Down Expand Up @@ -112,20 +112,19 @@ jobs:
echo "currentWorkflowFile=$(echo ${{ github.workflow_ref }} | sed -nE "s/.*(\.github\/workflows\/[a-zA-Z0-9_-]*\.y[a]?ml)@refs.*/\1/p")" >> $GITHUB_OUTPUT
echo "currentActionDir=$(echo ${{ github.action_path }} | sed -nE "s/.*(\.github\/actions\/[a-zA-Z0-9_-]*)/\1/p")" >> $GITHUB_OUTPUT

# removed due to https://news.ycombinator.com/item?id=43368870
#- name: Set changes
# id: set_changes
# uses: tj-actions/changed-files@v45
# with:
# files_yaml: |
# rust:
# - '**/*'
# - '!.github/**/*'
# - '!prdoc/**/*'
# - '!docs/**/*'
# currentWorkflow:
# - '${{ steps.current_file.outputs.currentWorkflowFile }}'
# - '.github/workflows/reusable-preflight.yml'
- name: Set changes
id: set_changes
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c #v46.0.5
with:
files_yaml: |
rust:
- '**/*'
- '!.github/**/*'
- '!prdoc/**/*'
- '!docs/**/*'
currentWorkflow:
- '${{ steps.current_file.outputs.currentWorkflowFile }}'
- '.github/workflows/reusable-preflight.yml'

#
# Set image
Expand Down Expand Up @@ -181,6 +180,7 @@ jobs:
shell: bash
run: |
echo "workflow file: ${{ steps.current_file.outputs.currentWorkflowFile }}"
echo "Modified: ${{ steps.set_changes.outputs.modified_keys }}"

#
#
Expand Down Expand Up @@ -219,4 +219,4 @@ jobs:
#
echo "github.ref: ${{ github.ref }}"
echo "github.ref_name: ${{ github.ref_name }}"
echo "github.sha: ${{ github.sha }}"
echo "github.sha: ${{ github.sha }}"
50 changes: 25 additions & 25 deletions .github/workflows/zombienet-reusable-preflight.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,11 @@ jobs:
preflight:
runs-on: ubuntu-latest
outputs:
changes_substrate: true
changes_cumulus: true
changes_polkadot: true
changes_bridges: true
changes_templates: true
changes_substrate: ${{ steps.set_changes.outputs.substrate_any_changed || steps.set_changes.outputs.currentWorkflow_any_changed }}
changes_cumulus: ${{ steps.set_changes.outputs.cumulus_any_changed || steps.set_changes.outputs.currentWorkflow_any_changed }}
changes_polkadot: ${{ steps.set_changes.outputs.polkadot_any_changed || steps.set_changes.outputs.currentWorkflow_any_changed }}
changes_bridges: ${{ steps.set_changes.outputs.bridges_any_changed || steps.set_changes.outputs.currentWorkflow_any_changed }}
changes_templates: ${{ steps.set_changes.outputs.templates_any_changed || steps.set_changes.outputs.currentWorkflow_any_changed }}

CI_IMAGE: ${{ steps.set_vars.outputs.IMAGE }}

Expand Down Expand Up @@ -157,26 +157,25 @@ jobs:
echo "currentWorkflowFile=$(echo ${{ github.workflow_ref }} | sed -nE "s/.*(\.github\/workflows\/[a-zA-Z0-9_-]*\.y[a]?ml)@refs.*/\1/p")" >> $GITHUB_OUTPUT
echo "currentActionDir=$(echo ${{ github.action_path }} | sed -nE "s/.*(\.github\/actions\/[a-zA-Z0-9_-]*)/\1/p")" >> $GITHUB_OUTPUT

# removed due to https://news.ycombinator.com/item?id=43368870
#- name: Set changes
# id: set_changes
# uses: tj-actions/changed-files@v45
# with:
# files_yaml: |
# substrate:
# - 'substrate/**/*'
# cumulus:
# - 'cumulus/**/*'
# polkadot:
# - 'polkadot/**/*'
# bridges:
# - 'bridges/**/*'
# templates:
# - 'templates/**/*'
# currentWorkflow:
# - '${{ steps.current_file.outputs.currentWorkflowFile }}'
# - '.github/workflows/zombienet-reusable-preflight.yml'
# - '.github/zombienet-env'
- name: Set changes
id: set_changes
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c #v46.0.5
with:
files_yaml: |
substrate:
- 'substrate/**/*'
cumulus:
- 'cumulus/**/*'
polkadot:
- 'polkadot/**/*'
bridges:
- 'bridges/**/*'
templates:
- 'templates/**/*'
currentWorkflow:
- '${{ steps.current_file.outputs.currentWorkflowFile }}'
- '.github/workflows/zombienet-reusable-preflight.yml'
- '.github/zombienet-env'

#
# Set environment vars (including runner/image)
Expand Down Expand Up @@ -209,6 +208,7 @@ jobs:
shell: bash
run: |
echo "workflow file: ${{ steps.current_file.outputs.currentWorkflowFile }}"
echo "Modified: ${{ steps.set_changes.outputs.modified_keys }}"
echo "ZOMBIENET_IMAGE: ${{ steps.set_vars.outputs.ZOMBIENET_IMAGE }}"
echo "CI_IMAGE: ${{ steps.set_vars.outputs.IMAGE }}"

Expand Down
Loading