From ee57a3484e3f46f543b10784555d3f442f2f40bc Mon Sep 17 00:00:00 2001 From: Luc Edes <60040621+lucedes27@users.noreply.github.com> Date: Sun, 14 May 2023 16:20:55 +0200 Subject: [PATCH 1/4] Website updates - Create CFLogo.png - Update API folder - Introduce GitHub workflow to copy changes to gh-pages branch --- .github/workflows/maven.yml | 8 ++++++++ CFLogo.png | Bin 0 -> 4035 bytes .../github/eisop/website/EisopSiteGenerator.java | 8 ++++++++ 3 files changed, 16 insertions(+) create mode 100644 CFLogo.png diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index e30a33df4..7ea8c7423 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -37,3 +37,11 @@ jobs: # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive - name: Update dependency graph uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 + + # Copy the files to the gh-pages branch + - name: Copy To Branches Action + uses: planetoftheweb/copy-to-branches@v1.2 + env: + key: main + branches: gh-pages + files: afu-template.md cf-template.md CFLogo.png README.md index.md pom.xml 404.html src/main/java/io/github/eisop/website/EisopSiteGenerator.java diff --git a/CFLogo.png b/CFLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..ddea37e3cba82fe1d52b1325a95187c81ac313ab GIT binary patch literal 4035 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 literal 0 HcmV?d00001 diff --git a/src/main/java/io/github/eisop/website/EisopSiteGenerator.java b/src/main/java/io/github/eisop/website/EisopSiteGenerator.java index c30317cac..69c585a05 100644 --- a/src/main/java/io/github/eisop/website/EisopSiteGenerator.java +++ b/src/main/java/io/github/eisop/website/EisopSiteGenerator.java @@ -161,6 +161,9 @@ public static void main(String[] args) throws IOException { e.printStackTrace(); } + File releaseOrg = new File(String.valueOf(javadocFolder) + "/checker-javadoc/org"); + FileUtils.copyDirectoryToDirectory(releaseOrg, javadocFolder); + // Move index.html // File releaseHTML = new File(String.valueOf(releaseFolder) + // "/docs/tutorial/index.html"); @@ -305,6 +308,11 @@ public static void main(String[] args) throws IOException { System.out.println("Latest release: " + String.valueOf(latestRelease)); + // Copy CFLogo.png to cf/ + File cfLogo = new File(String.valueOf(latestRelease) + "/tutorial/CFLogo.png"); + File newCFLogo = new File(System.getProperty("user.dir") + "/cf/CFLogo.png"); + FileUtils.copyFile(cfLogo, newCFLogo); + getAFU(); } From ea5a9516a1fc0ef31a112ffde2b903d28ea985e8 Mon Sep 17 00:00:00 2001 From: Luc Edes <60040621+lucedes27@users.noreply.github.com> Date: Wed, 24 May 2023 16:05:42 +0200 Subject: [PATCH 2/4] Rename cf/manual/manual.pdf to cf/manual/checker-framework-manual.pdf --- .../java/io/github/eisop/website/EisopSiteGenerator.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/io/github/eisop/website/EisopSiteGenerator.java b/src/main/java/io/github/eisop/website/EisopSiteGenerator.java index 69c585a05..0003d9aa0 100644 --- a/src/main/java/io/github/eisop/website/EisopSiteGenerator.java +++ b/src/main/java/io/github/eisop/website/EisopSiteGenerator.java @@ -308,6 +308,11 @@ public static void main(String[] args) throws IOException { System.out.println("Latest release: " + String.valueOf(latestRelease)); + // Rename cf/manual/manual.pdf to cf/manual/checker-framework-manual.pdf + File manualPDF = new File(String.valueOf(directoryPath) + "/manual/manual.pdf"); + File checkerFrameworkManualPDF = new File(String.valueOf(directoryPath) + "/manual/checker-framework-manual.pdf"); + FileUtils.copyFile(manualPDF, checkerFrameworkManualPDF); + // Copy CFLogo.png to cf/ File cfLogo = new File(String.valueOf(latestRelease) + "/tutorial/CFLogo.png"); File newCFLogo = new File(System.getProperty("user.dir") + "/cf/CFLogo.png"); From 6906143c55076a08096e33b15ba43765fbea68e0 Mon Sep 17 00:00:00 2001 From: Luc Edes <60040621+lucedes27@users.noreply.github.com> Date: Wed, 24 May 2023 16:12:17 +0200 Subject: [PATCH 3/4] Site generator improvements - Remove useless CFLogo.png - Avoid having two copies of checker-javadoc/org folder --- CFLogo.png | Bin 4035 -> 0 bytes .../github/eisop/website/EisopSiteGenerator.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 CFLogo.png diff --git a/CFLogo.png b/CFLogo.png deleted file mode 100644 index ddea37e3cba82fe1d52b1325a95187c81ac313ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4035 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 diff --git a/src/main/java/io/github/eisop/website/EisopSiteGenerator.java b/src/main/java/io/github/eisop/website/EisopSiteGenerator.java index 0003d9aa0..6d9b88fd0 100644 --- a/src/main/java/io/github/eisop/website/EisopSiteGenerator.java +++ b/src/main/java/io/github/eisop/website/EisopSiteGenerator.java @@ -162,7 +162,7 @@ public static void main(String[] args) throws IOException { } File releaseOrg = new File(String.valueOf(javadocFolder) + "/checker-javadoc/org"); - FileUtils.copyDirectoryToDirectory(releaseOrg, javadocFolder); + FileUtils.moveDirectoryToDirectory(releaseOrg, javadocFolder, false); // Move index.html // File releaseHTML = new File(String.valueOf(releaseFolder) + From 9efd1c4131ecb921ddb9ec36e7969405c9326868 Mon Sep 17 00:00:00 2001 From: Werner Dietl Date: Mon, 26 Jun 2023 16:30:50 -0400 Subject: [PATCH 4/4] Undo copy to gh-pages action --- .github/workflows/maven.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index a5afdc5fc..4dd16cc25 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -34,14 +34,6 @@ jobs: - name: Build with Maven run: mvn -B package --file pom.xml - # Copy the files to the gh-pages branch - - name: Copy To Branches Action - uses: planetoftheweb/copy-to-branches@v1.2 - env: - key: main - branches: gh-pages - files: afu-template.md cf-template.md CFLogo.png README.md index.md pom.xml 404.html src/main/java/io/github/eisop/website/EisopSiteGenerator.java - # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive # - name: Update dependency graph # uses: advanced-security/maven-dependency-submission-action@v3