Skip to content

Commit

Permalink
Merge pull request actions#2388 from actions/readonly-sync
Browse files Browse the repository at this point in the history
Add the concept of a "read-only" synced folder
  • Loading branch information
yoannchaudet authored Apr 29, 2024
2 parents 79af930 + 2c3a9ca commit 9b485d4
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 6 deletions.
22 changes: 17 additions & 5 deletions script/sync-ghes/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,22 @@ async function checkWorkflow(
await exec("git", ["checkout", "ghes"]);

// In order to sync from main, we might need to remove some workflows, add some
// and modify others. The lazy approach is to delete all workflows first, and then
// and modify others. The lazy approach is to delete all workflows first (except from read-only folders), and then
// just bring the compatible ones over from the main branch. We let git figure out
// whether it's a deletion, add, or modify and commit the new state.
console.log("Remove all workflows");
await exec("rm", ["-fr", ...settings.folders]);
await exec("rm", ["-fr", "../../icons"]);

// Bring back the read-only folders
console.log("Restore read-only folders");
for (let i = 0; i < settings.readOnlyFolders.length; i++) {
await exec("git", [
"checkout",
settings.readOnlyFolders[i]
]);
}

console.log("Sync changes from main for compatible workflows");
await exec("git", [
"checkout",
Expand All @@ -171,10 +180,13 @@ async function checkWorkflow(
...Array.prototype.concat.apply(
[],
result.compatibleWorkflows.map((x) => {
const r = [
join(x.folder, `${x.id}.yml`),
join(x.folder, "properties", `${x.id}.properties.json`),
];
const r = [];

// Don't touch read-only folders
if (!settings.readOnlyFolders.includes(x.folder)) {
r.push(join(x.folder, `${x.id}.yml`));
r.push(join(x.folder, "properties", `${x.id}.properties.json`));
};

if (x.iconType === "svg") {
r.push(join("../../icons", `${x.iconName}.svg`));
Expand Down
6 changes: 5 additions & 1 deletion script/sync-ghes/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
"folders": [
"../../ci",
"../../automation",
"../../code-scanning"
"../../code-scanning",
"../../pages"
],
"readOnlyFolders": [
"../../pages"
],
"enabledActions": [
"actions/cache",
Expand Down

0 comments on commit 9b485d4

Please sign in to comment.