Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/paritytech/polkadot-sdk i…
Browse files Browse the repository at this point in the history
…nto HEAD
  • Loading branch information
command-bot committed Aug 5, 2024
2 parents d3e76cb + 035211d commit 87016f3
Show file tree
Hide file tree
Showing 92 changed files with 2,717 additions and 534 deletions.
19 changes: 9 additions & 10 deletions .github/workflows/misc-sync-templates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@ on:
# A manual dispatch for now - automatic on releases later.
workflow_dispatch:
inputs:
crate_release_version:
description: 'A release version to use, e.g. 1.9.0'
stable_release_branch:
description: 'Stable release branch, e.g. stable2407'
required: true


jobs:
sync-templates:
runs-on: ubuntu-latest
Expand All @@ -44,7 +43,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: polkadot-sdk
ref: "release-crates-io-v${{ github.event.inputs.crate_release_version }}"
ref: "${{ github.event.inputs.stable_release_branch }}"
- name: Generate a token for the template repository
id: app_token
uses: actions/[email protected]
Expand Down Expand Up @@ -72,8 +71,8 @@ jobs:
# 2. Yanking the template out of the monorepo workspace.

- name: Use psvm to replace git references with released creates.
run: find . -type f -name 'Cargo.toml' -exec psvm -o -v ${{ github.event.inputs.crate_release_version }} -p {} \;
- name: Replace dev-dependencies path references with workspace references
run: find . -type f -name 'Cargo.toml' -exec sed -i'' -E "s/path = \"\.\.\/.*\"/workspace = true/g" {} \;
working-directory: polkadot-sdk/templates/${{ matrix.template }}/
- name: Create a new workspace Cargo.toml
run: |
Expand Down Expand Up @@ -123,7 +122,7 @@ jobs:
cp -r polkadot-sdk/templates/${{ matrix.template }}/* "${{ env.template-path }}/"
- name: Run psvm on monorepo workspace dependencies
run: psvm -o -v ${{ github.event.inputs.crate_release_version }} -p ./Cargo.toml
run: psvm -o -v ${{ github.event.inputs.stable_release_branch }} -p ./Cargo.toml
working-directory: polkadot-sdk/
- name: Copy over required workspace dependencies
run: |
Expand Down Expand Up @@ -164,12 +163,12 @@ jobs:
token: ${{ steps.app_token.outputs.token }}
add-paths: |
./*
title: "[Don't merge] Update the ${{ matrix.template }} template to ${{ github.event.inputs.crate_release_version }}"
title: "[Don't merge] Update the ${{ matrix.template }} template to ${{ github.event.inputs.stable_release_branch }}"
body: "The template has NOT been successfully built and needs to be inspected."
branch: "update-template/${{ github.event.inputs.crate_release_version }}"
branch: "update-template/${{ github.event.inputs.stable_release_branch }}"
- name: Push changes
run: |
git add -A .
git commit --allow-empty -m "Update to ${{ github.event.inputs.crate_release_version }} triggered by ${{ github.event_name }}"
git commit --allow-empty -m "Update to ${{ github.event.inputs.stable_release_branch }} triggered by ${{ github.event_name }}"
git push
working-directory: "${{ env.template-path }}"
42 changes: 19 additions & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 87016f3

Please sign in to comment.