Skip to content

Commit

Permalink
add ff-merge instructions and scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
thomas-roos authored Oct 8, 2024
1 parent f1e059b commit 6528992
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 358 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ This project has three goals:
```text
auto-upgrader/ <= tool that is used in meta-aws to generate pull requests if an recipe upgrade is available
docs/ <= writeups of different topics
ff-merge/ <= script to perform -next to release branch ff merge
release-tests/ <= script to build and ptests all Yocto meta-aws releases
```

Expand Down
358 changes: 0 additions & 358 deletions core/cfn/build_demos_prod.yml

This file was deleted.

1 change: 1 addition & 0 deletions docs/new_release_checklist.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Things to do when a new yocto release comes up
- Create a new branch and -next branch based on master-next.
- Add in GitHub backport action add new branch-next to backport to.
- Add release to ff-merge script if you have any.
3 changes: 3 additions & 0 deletions ff-merge/release.sh → ff-merge/meta-aws-ffmerge
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#!/usr/bin/env bash
echo "Press any key to continue - no parameter given this will git fast forward master-next to master"
read
set -euxo pipefail

BRANCH="${BRANCH:-master}"
ORG="${ORG:-aws4embeddedlinux}"

# For Linux and MacOS compat, avoid the -t option with mktemp!
WORKDIR=$(mktemp -d "${TMPDIR:-/tmp}/release.XXXXXXXXX")

Expand Down
7 changes: 7 additions & 0 deletions ff-merge/meta-aws-ffmerge-all
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

BRANCH_LIST="dunfell gatesgarth hardknott honister kirkstone master zeus langdale mickledore nanbield scarthgap styhead"

for b in $BRANCH_LIST; do
BRANCH=$b ~/bin/meta-aws-ffmerge
done

0 comments on commit 6528992

Please sign in to comment.