Skip to content

Commit 038a756

Browse files
committed
chore: add fork notice to README
Mark this repository as a Philips internal fork with no external support. Direct users to the upstream repository for questions and issues. Signed-off-by: Brend Smits <brend.smits@philips.com>
1 parent b1936c3 commit 038a756

2 files changed

Lines changed: 48 additions & 7 deletions

File tree

.github/workflows/sync-upstream.yml

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ name: Sync upstream
22

33
on:
44
schedule:
5-
- cron: '0 6 * * *'
5+
- cron: '0 5 * * *' # ~7 AM Amsterdam (CEST) / 6 AM (CET)
6+
- cron: '0 22 * * *' # ~midnight Amsterdam (CEST) / 11 PM (CET)
67
workflow_dispatch:
78

89
permissions:
@@ -19,11 +20,18 @@ jobs:
1920
with:
2021
egress-policy: audit
2122

23+
- name: Generate GitHub App token
24+
id: app-token
25+
uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1.12.0
26+
with:
27+
app-id: ${{ secrets.APP_ID }}
28+
private-key: ${{ secrets.APP_PRIVATE_KEY }}
29+
2230
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2331
with:
2432
ref: main
2533
fetch-depth: 0
26-
token: ${{ secrets.SYNC_TOKEN_GITHUB_FG_PAT }}
34+
token: ${{ steps.app-token.outputs.token }}
2735

2836
- name: Sync main with upstream
2937
run: |
@@ -44,11 +52,18 @@ jobs:
4452
with:
4553
egress-policy: audit
4654

55+
- name: Generate GitHub App token
56+
id: app-token
57+
uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1.12.0
58+
with:
59+
app-id: ${{ secrets.APP_ID }}
60+
private-key: ${{ secrets.APP_PRIVATE_KEY }}
61+
4762
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4863
with:
4964
ref: philips
5065
fetch-depth: 0
51-
token: ${{ secrets.SYNC_TOKEN_GITHUB_FG_PAT }}
66+
token: ${{ steps.app-token.outputs.token }}
5267

5368
- name: Configure git
5469
run: |
@@ -74,12 +89,32 @@ jobs:
7489
if: steps.rebase.outputs.result == 'success'
7590
id: new-releases
7691
run: |
77-
# Get all upstream version tags (v*) that don't have a corresponding upstream-v* tag
92+
# Find the latest existing upstream-v* tag to use as a baseline
93+
latest_existing=$(git tag -l 'upstream-v[0-9]*' --sort=-version:refname | head -1 | sed 's/^upstream-//')
94+
95+
if [ -n "$latest_existing" ]; then
96+
echo "Latest existing upstream tracking tag: upstream-${latest_existing}"
97+
else
98+
echo "No existing upstream tracking tags found — will tag only the latest upstream release"
99+
fi
100+
101+
# Find upstream v* tags that are newer than our latest upstream-v* tag
78102
new_tags=""
79103
for tag in $(git tag -l 'v[0-9]*' --sort=-version:refname); do
80-
if ! git tag -l "upstream-${tag}" | grep -q .; then
81-
new_tags="${new_tags}${tag}\n"
104+
# Skip if we already have an upstream-v* for this version
105+
if git tag -l "upstream-${tag}" | grep -q .; then
106+
continue
82107
fi
108+
109+
# Skip if this tag is older than or equal to our latest tracked version
110+
if [ -n "$latest_existing" ]; then
111+
if [ "$(printf '%s\n%s' "$tag" "$latest_existing" | sort -V | tail -1)" = "$latest_existing" ]; then
112+
echo "Skipping ${tag} (older than or equal to ${latest_existing})"
113+
continue
114+
fi
115+
fi
116+
117+
new_tags="${new_tags}${tag}\n"
83118
done
84119
85120
if [ -n "$new_tags" ]; then
@@ -107,7 +142,7 @@ jobs:
107142
- name: Trigger release workflow
108143
if: steps.rebase.outputs.result == 'success' && steps.new-releases.outputs.found == 'true'
109144
env:
110-
GH_TOKEN: ${{ secrets.SYNC_TOKEN_GITHUB_FG_PAT }}
145+
GH_TOKEN: ${{ steps.app-token.outputs.token }}
111146
UPSTREAM_TAG: ${{ steps.new-releases.outputs.latest }}
112147
run: |
113148
gh workflow run philips-release.yml \

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# Philips Fork — terraform-aws-github-runner
2+
3+
> **This is an internal Philips fork of [github-aws-runners/terraform-aws-github-runner](https://github.com/github-aws-runners/terraform-aws-github-runner).** It exists to allow early deployment of fixes and features before they land in an upstream release. We do not provide support for external users — please direct all questions and issues to the [upstream repository](https://github.com/github-aws-runners/terraform-aws-github-runner/issues).
4+
5+
---
6+
17
# Terraform module Self-Hosted Scalable GitHub Actions runners on AWS.
28

39
[![docs](https://img.shields.io/badge/docs-runners-blue.svg)](https://github-aws-runners.github.io/terraform-aws-github-runner) [![awesome-runners](https://img.shields.io/badge/listed%20on-awesome--runners-blue.svg)](https://github.com/jonico/awesome-runners) [![Terraform registry](https://img.shields.io/github/v/release/github-aws-runners/terraform-aws-github-runner?label=Terraform%20Registry)](https://registry.terraform.io/modules/github-aws-runners/github-runner/aws/) [![Terraform checks](https://github.com/github-aws-runners/terraform-aws-github-runner/actions/workflows/terraform.yml/badge.svg)](https://github.com/github-aws-runners/terraform-aws-github-runner/actions/workflows/terraform.yml) [![Lambdas](https://github.com/github-aws-runners/terraform-aws-github-runner/actions/workflows/lambda.yml/badge.svg)](https://github.com/github-aws-runners/terraform-aws-github-runner/actions/workflows/lambda.yml) [![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/github-aws-runners/terraform-aws-github-runner/badge)](https://scorecard.dev/viewer/?uri=github.com/github-aws-runners/terraform-aws-github-runner) [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/10905/badge)](https://www.bestpractices.dev/projects/10905)

0 commit comments

Comments
 (0)