Skip to content

Commit a9eb1d2

Browse files
authored
Merge branch 'master' into ankn/rc-no-exposure
2 parents e043ded + d3f6851 commit a9eb1d2

File tree

3 files changed

+42
-42
lines changed

3 files changed

+42
-42
lines changed

.github/workflows/reusable-preflight.yml

+16-16
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ jobs:
7878
preflight:
7979
runs-on: ubuntu-latest
8080
outputs:
81-
changes_rust: ${{ steps.set_changes.outputs.rust_any_changed || steps.set_changes.outputs.currentWorkflow_any_changed }}
82-
changes_currentWorkflow: ${{ steps.set_changes.outputs.currentWorkflow_any_changed }}
81+
changes_rust: true
82+
changes_currentWorkflow: true
8383

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

@@ -112,19 +112,20 @@ jobs:
112112
echo "currentWorkflowFile=$(echo ${{ github.workflow_ref }} | sed -nE "s/.*(\.github\/workflows\/[a-zA-Z0-9_-]*\.y[a]?ml)@refs.*/\1/p")" >> $GITHUB_OUTPUT
113113
echo "currentActionDir=$(echo ${{ github.action_path }} | sed -nE "s/.*(\.github\/actions\/[a-zA-Z0-9_-]*)/\1/p")" >> $GITHUB_OUTPUT
114114
115-
- name: Set changes
116-
id: set_changes
117-
uses: tj-actions/changed-files@v45
118-
with:
119-
files_yaml: |
120-
rust:
121-
- '**/*'
122-
- '!.github/**/*'
123-
- '!prdoc/**/*'
124-
- '!docs/**/*'
125-
currentWorkflow:
126-
- '${{ steps.current_file.outputs.currentWorkflowFile }}'
127-
- '.github/workflows/reusable-preflight.yml'
115+
# removed due to https://news.ycombinator.com/item?id=43368870
116+
#- name: Set changes
117+
# id: set_changes
118+
# uses: tj-actions/changed-files@v45
119+
# with:
120+
# files_yaml: |
121+
# rust:
122+
# - '**/*'
123+
# - '!.github/**/*'
124+
# - '!prdoc/**/*'
125+
# - '!docs/**/*'
126+
# currentWorkflow:
127+
# - '${{ steps.current_file.outputs.currentWorkflowFile }}'
128+
# - '.github/workflows/reusable-preflight.yml'
128129

129130
#
130131
# Set image
@@ -180,7 +181,6 @@ jobs:
180181
shell: bash
181182
run: |
182183
echo "workflow file: ${{ steps.current_file.outputs.currentWorkflowFile }}"
183-
echo "Modified: ${{ steps.set_changes.outputs.modified_keys }}"
184184
185185
#
186186
#

.github/workflows/zombienet-reusable-preflight.yml

+25-25
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@ jobs:
102102
preflight:
103103
runs-on: ubuntu-latest
104104
outputs:
105-
changes_substrate: ${{ steps.set_changes.outputs.substrate_any_changed || steps.set_changes.outputs.currentWorkflow_any_changed }}
106-
changes_cumulus: ${{ steps.set_changes.outputs.cumulus_any_changed || steps.set_changes.outputs.currentWorkflow_any_changed }}
107-
changes_polkadot: ${{ steps.set_changes.outputs.polkadot_any_changed || steps.set_changes.outputs.currentWorkflow_any_changed }}
108-
changes_bridges: ${{ steps.set_changes.outputs.bridges_any_changed || steps.set_changes.outputs.currentWorkflow_any_changed }}
109-
changes_templates: ${{ steps.set_changes.outputs.templates_any_changed || steps.set_changes.outputs.currentWorkflow_any_changed }}
105+
changes_substrate: true
106+
changes_cumulus: true
107+
changes_polkadot: true
108+
changes_bridges: true
109+
changes_templates: true
110110

111111
ZOMBIENET_IMAGE: ${{ steps.set_vars.outputs.ZOMBIENET_IMAGE }}
112112
ZOMBIENET_RUNNER: ${{ steps.set_vars.outputs.ZOMBIENET_RUNNER }}
@@ -139,25 +139,26 @@ jobs:
139139
echo "currentWorkflowFile=$(echo ${{ github.workflow_ref }} | sed -nE "s/.*(\.github\/workflows\/[a-zA-Z0-9_-]*\.y[a]?ml)@refs.*/\1/p")" >> $GITHUB_OUTPUT
140140
echo "currentActionDir=$(echo ${{ github.action_path }} | sed -nE "s/.*(\.github\/actions\/[a-zA-Z0-9_-]*)/\1/p")" >> $GITHUB_OUTPUT
141141
142-
- name: Set changes
143-
id: set_changes
144-
uses: tj-actions/changed-files@v45
145-
with:
146-
files_yaml: |
147-
substrate:
148-
- 'substrate/**/*'
149-
cumulus:
150-
- 'cumulus/**/*'
151-
polkadot:
152-
- 'polkadot/**/*'
153-
bridges:
154-
- 'bridges/**/*'
155-
templates:
156-
- 'templates/**/*'
157-
currentWorkflow:
158-
- '${{ steps.current_file.outputs.currentWorkflowFile }}'
159-
- '.github/workflows/zombienet-reusable-preflight.yml'
160-
- '.github/zombienet-env'
142+
# removed due to https://news.ycombinator.com/item?id=43368870
143+
#- name: Set changes
144+
# id: set_changes
145+
# uses: tj-actions/changed-files@v45
146+
# with:
147+
# files_yaml: |
148+
# substrate:
149+
# - 'substrate/**/*'
150+
# cumulus:
151+
# - 'cumulus/**/*'
152+
# polkadot:
153+
# - 'polkadot/**/*'
154+
# bridges:
155+
# - 'bridges/**/*'
156+
# templates:
157+
# - 'templates/**/*'
158+
# currentWorkflow:
159+
# - '${{ steps.current_file.outputs.currentWorkflowFile }}'
160+
# - '.github/workflows/zombienet-reusable-preflight.yml'
161+
# - '.github/zombienet-env'
161162

162163
#
163164
# Set environment vars (including runner/image)
@@ -187,7 +188,6 @@ jobs:
187188
shell: bash
188189
run: |
189190
echo "workflow file: ${{ steps.current_file.outputs.currentWorkflowFile }}"
190-
echo "Modified: ${{ steps.set_changes.outputs.modified_keys }}"
191191
echo "ZOMBIENET_IMAGE: ${{ steps.set_vars.outputs.ZOMBIENET_IMAGE }}"
192192
193193
#

substrate/frame/transaction-payment/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ type BalanceOf<T> = <<T as Config>::OnChargeTransaction as OnChargeTransaction<T
140140
/// Meaning that fees can change by around ~23% per day, given extreme congestion.
141141
///
142142
/// More info can be found at:
143-
/// <https://research.web3.foundation/en/latest/polkadot/overview/2-token-economics.html>
143+
/// <https://research.web3.foundation/Polkadot/overview/token-economics>
144144
pub struct TargetedFeeAdjustment<T, S, V, M, X>(core::marker::PhantomData<(T, S, V, M, X)>);
145145

146146
/// Something that can convert the current multiplier to the next one.

0 commit comments

Comments
 (0)