Updates! (Updating the build scripts for Vcpkg)

Author: RealTimeChris

.github/workflows/Build-Documentation.yml

@@ -40,4 +40,4 @@ jobs:
                 cd DiscordCoreAPI-Docs 
                 sudo git add . 
                 sudo git commit -m "Updates!" || true
-                sudo git push origin main || true
+                sudo git push origin main || true

…lows/Build-DiscordCoreAPI-Linux-Main.yml …ithub/workflows/Construct-Vcpkg-Info.yml.github/workflows/Build-DiscordCoreAPI-Linux-Main.yml renamed to .github/workflows/Construct-Vcpkg-Info.yml .github/workflows/Build-DiscordCoreAPI-Linux-Main.yml renamed to .github/workflows/Construct-Vcpkg-Info.yml

@@ -1,7 +1,8 @@
 name: Prepare release for VCPKG
 
 on:
-  push:
+  release:
+    types: [published]
   workflow_dispatch:
 
 jobs:
@@ -28,6 +29,7 @@ jobs:
                 sudo vcpkg update
 
          - name: Run vcpkg release builder
-           run: git fetch -avt &&
+           run: dir /home/runner/work/DiscordCoreAPI/DiscordCoreAPI &&
+                git fetch -avt &&
                 cd BuildTools &&
-                php make_vcpkg.php "${{ github.repository_owner }}" "${{ secrets.PERSONAL_ACCESS_TOKEN }}"
+                php make_vcpkg.php "${{ github.repository_owner }}" "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/DeleteRuns.yml

@@ -0,0 +1,57 @@
+name: Delete old workflow runs
+on:
+  workflow_dispatch:
+    inputs:
+      days:
+        description: 'Number of days.'
+        required: true
+        default: "0"
+      minimum_runs:
+        description: 'The minimum runs to keep for each workflow.'
+        required: true
+        default: "1"
+      delete_workflow_pattern:
+        description: 'The name or filename of the workflow. if not set then it will target all workflows.'
+        required: false
+      delete_workflow_by_state_pattern:
+        description: 'Remove workflow by state: active, deleted, disabled_fork, disabled_inactivity, disabled_manually'
+        required: true
+        default: "All"
+        type: choice
+        options:
+          - "All"
+          - active
+          - deleted
+          - disabled_inactivity
+          - disabled_manually
+      delete_run_by_conclusion_pattern:
+        description: 'Remove workflow by conclusion: action_required, cancelled, failure, skipped, success'
+        required: true
+        default: "All"
+        type: choice
+        options:
+          - "All"
+          - action_required
+          - cancelled
+          - failure
+          - skipped
+          - success
+      dry_run:
+        description: 'Only log actions, do not perform any delete operations.'
+        required: false
+
+jobs:
+  del_runs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Delete workflow runs
+        uses: Mattraks/delete-workflow-runs@v2
+        with:
+          token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          retain_days: ${{ github.event.inputs.days }}
+          keep_minimum_runs: ${{ github.event.inputs.minimum_runs }}
+          delete_workflow_pattern: ${{ github.event.inputs.delete_workflow_pattern }}
+          delete_workflow_by_state_pattern: ${{ github.event.inputs.delete_workflow_by_state_pattern }}
+          delete_run_by_conclusion_pattern: ${{ github.event.inputs.delete_run_by_conclusion_pattern }}
+          dry_run: ${{ github.event.inputs.dry_run }}

BuildTools/Vendor/Composer/autoload_classmap.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace DiscordCoreAPI\Packager;
+namespace discordcoreapi\Packager;
 
 use \RuntimeException;
 
@@ -46,13 +46,12 @@ public function __construct()
         if (count($argv) < 2) {
             throw new RuntimeException(RED . "Missing github repository owner and access token\n" . WHITE);
         }
-        echo GREEN . "Starting Vcpkg updater...\n" . WHITE;
+        echo GREEN . "Starting vcpkg updater...\n" . WHITE;
 
         /* Get the latest tag from the version of the repository checked out by default into the action */
         $this->latestTag = preg_replace("/\n/", "", shell_exec("git describe --tags `git rev-list --tags --max-count=1`"));
         $this->version = preg_replace('/^v/', '', $this->getTag());
         echo GREEN . "Latest tag: " . $this->getTag() . " version: " . $this->getVersion() . "\n" . WHITE;
-        echo GREEN . trim(`which sudo`) . WHITE;
 
 	$this->git = trim(`which git`);
 	$this->sudo = trim(`which sudo`);
@@ -80,12 +79,12 @@ public function getTag(): string
 
     private function git(string $parameters, bool $sudo = false): void
     {
-        system(($sudo ? 'sudo ' : '') . $this->git . ' ' . $parameters);
+        system(($sudo ? $this->sudo . ' ' : '') . $this->git . ' ' . $parameters);
     }
 
-   private function sudo(string $command): void
+    private function sudo(string $command): void
     {
-        system('sudo ' . $command);
+        system($this->sudo . ' ' . $command);
     }
 
     /**
@@ -103,13 +102,13 @@ function checkoutRepository(string $tag = ""): bool
             /* Empty tag means use the main branch */
             $tag = `{$this->git} config --get init.defaultBranch || echo main`;
         }
-	$repositoryUrl = 'https://' . urlencode($argv[1]) . ':' . urlencode($argv[2]) . '@github.com/realtimechris/DiscordCoreAPI';
+	$repositoryUrl = 'https://' . urlencode($argv[1]) . ':' . urlencode($argv[2]) . '@github.com/realtimechris/discordcoreapi';
 
         echo GREEN . "Check out repository: $tag (user: ". $argv[1] . " branch: " . $tag . ")\n" . WHITE;
 
         chdir(getenv('HOME'));
         system('rm -rf ./discordcoreapi');
-        $this->git('config --global user.email "noreply@discordcoreapi.com"');
+        $this->git('config --global user.email "[email protected].com"');
         $this->git('config --global user.name "realtimechris"');
         $this->git('clone ' . escapeshellarg($repositoryUrl) . ' ./discordcoreapi --depth=1');
 
@@ -126,7 +125,7 @@ function checkoutRepository(string $tag = ""): bool
      * build the branch that is cloned at ~/discordcoreapi
      * 
      * @param string $sha512 The SHA512 sum of the tagged download, or initially
-     * zero, which means that the Vcpkg install command should obtain it the
+     * zero, which means that the vcpkg install command should obtain it the
      * second time around.
      * @return string The portfile content
      */
@@ -142,7 +141,8 @@ function constructPortAndVersionFile(string $sha512 = "0"): string
 vcpkg_from_github(
 	OUT_SOURCE_PATH SOURCE_PATH
 	REPO RealTimeChris/DiscordCoreAPI
-	REF "v${VERSION}"
+	REF 4e08675
+	SHA512 ' . $sha512 . 'HEAD_REF main
 )
 
 vcpkg_cmake_configure(
@@ -167,7 +167,7 @@ function constructPortAndVersionFile(string $sha512 = "0"): string
         // ./Vcpkg/ports/discordcoreapi/vcpkg.json
         $versionFileContent = '{
   "name": "discordcoreapi",
-  "version": "1.3.0",
+  "version-date": "2022-03-03",
   "description": "A Discord bot library written in C++ using custom asynchronous coroutines.",
   "homepage": "https://discordcoreapi.com",
   "license": "LGPL-2.1-or-later",
@@ -187,15 +187,14 @@ function constructPortAndVersionFile(string $sha512 = "0"): string
       "host": true
     }
   ]
-}
-';
+}';
         echo GREEN . "Writing portfile...\n" . WHITE;
         file_put_contents('./Vcpkg/ports/discordcoreapi/vcpkg.json', $versionFileContent);
         return $portFileContent;
     }
 
     /**
-     * Attempt the first build of the Vcpkg port. This will always fail, as it is given
+     * Attempt the first build of the vcpkg port. This will always fail, as it is given
      * an SHA512 sum of 0. When it fails the output contains the SHA512 sum, which is then
      * extracted from the error output using a regular expression, and saved for a second
      * attempt.
@@ -215,7 +214,7 @@ function firstBuild(string $portFileContent): string
         file_put_contents('/tmp/portfile', $portFileContent);
         $this->sudo('cp -v -R /tmp/portfile /usr/local/share/vcpkg/ports/discordcoreapi/portfile.cmake');
         unlink('/tmp/portfile');
-        $buildResults = shell_exec('sudo ' . ' /usr/local/share/vcpkg/vcpkg install discordcoreapi:x64-linux');
+        $buildResults = shell_exec($this->sudo . ' /usr/local/share/vcpkg/vcpkg install discordcoreapi:x64-linux');
         $matches = [];
         if (preg_match('/Actual hash:\s+([0-9a-fA-F]+)/', $buildResults, $matches)) {
             echo GREEN . "Obtained SHA512 for first build: " . $matches[1] . "\n" . WHITE;
@@ -228,8 +227,8 @@ function firstBuild(string $portFileContent): string
 
     /**
      * Second build using a valid SHA512 sum. This attempt should succeed, allowing us to push
-     * the changed Vcpkg portfiles into the master branch, where they can be used in a PR to
-     * microsoft/Vcpkg repository later.
+     * the changed vcpkg portfiles into the master branch, where they can be used in a PR to
+     * microsoft/vcpkg repository later.
      * 
      * @param string $portFileContent the contents of the portfile, containing a valid SHA512
      * sum from the first build attempt.
@@ -250,31 +249,31 @@ function secondBuild(string $portFileContent): bool
         $this->sudo('cp -v -R ./Vcpkg/ports/discordcoreapi/portfile.cmake /usr/local/share/vcpkg/ports/discordcoreapi/portfile.cmake');
         $this->sudo('cp -v -R ./Vcpkg/ports/* /usr/local/share/vcpkg/ports/');
 
-        echo GREEN . "Vcpkg x-add-version...\n" . WHITE;
+        echo GREEN . "vcpkg x-add-version...\n" . WHITE;
         chdir('/usr/local/share/vcpkg');
-        $this->sudo('./Vcpkg format-manifest ./ports/discordcoreapi/vcpkg.json');
+        $this->sudo('./vcpkg format-manifest ./ports/discordcoreapi/vcpkg.json');
         /* Note: We commit this in /usr/local, but we never push it (we can't) */
         $this->git('add .', true);
-        $this->git('git commit -m "[bot] VCPKG info update"', true);
+        $this->git('commit -m "VCPKG info update"', true);
         $this->sudo('/usr/local/share/vcpkg/vcpkg x-add-version discordcoreapi');
 
         echo GREEN . "Copy back port files from /usr/local/share...\n" . WHITE;
         chdir(getenv('HOME') . '/discordcoreapi');
         system('cp -v -R /usr/local/share/vcpkg/ports/discordcoreapi/vcpkg.json ./Vcpkg/ports/discordcoreapi/vcpkg.json');
         system('cp -v -R /usr/local/share/vcpkg/versions/baseline.json ./Vcpkg/versions/baseline.json');
-        system('cp -v -R /usr/local/share/vcpkg/versions/d-/discordcoreapi.json ./Vcpkg/versions/d-/discordcoreapi.json');
+        system('cp -v -R /usr/local/share/vcpkg/versions/j-/discordcoreapi.json ./Vcpkg/versions/j-/discordcoreapi.json');
 
-        echo GREEN . "Commit and push changes to master branch\n" . WHITE;
+        echo GREEN . "Commit and push changes to main branch\n" . WHITE;
         $this->git('add .');
-        $this->git('commit -m "[bot] VCPKG info update [skip ci]"');
+        $this->git('commit -m "VCPKG info update [skip ci]"');
         $this->git('config pull.rebase false');
         $this->git('pull');
-        $this->git('push origin master');
+        $this->git('push origin main');
 
-        echo GREEN . "Vcpkg install...\n" . WHITE;
+        echo GREEN . "vcpkg install...\n" . WHITE;
         $resultCode = 0;
         $output = [];
-        exec($this->sudo . ' /usr/local/share/vcpkg/Vcpkg install discordcoreapi:x64-linux', $output, $resultCode);
+        exec($this->sudo . ' /usr/local/share/vcpkg/vcpkg install discordcoreapi:x64-linux', $output, $resultCode);
 
         if ($resultCode != 0) {
             echo RED . "There were build errors!\n\nBuild log:\n" . WHITE;

BuildTools/Vendor/Composer/autoload_psr4.php

@@ -0,0 +1,17 @@
+{
+    "name": "RealTimeChris/discordcoreapi",
+    "description": "Jsoniifer Build Tools",
+    "type": "project",
+    "license": "Apache 2.0",
+    "autoload": {
+        "psr-4": {
+            "DiscordCoreAPI\\": "classes/"
+        }
+    },
+    "authors": [
+        {
+            "name": "chris"
+        }
+    ],
+    "require": {}
+}

BuildTools/Classes/Packager/Vcpkg.php BuildTools/classes/Packager/Vcpkg.phpBuildTools/Classes/Packager/Vcpkg.php renamed to BuildTools/classes/Packager/Vcpkg.php

@@ -1,8 +1,7 @@
 <?php
 
 /**
- * Copied from Dpp: https://github.com/brainboxdotcc/dpp 
- * CI process for generating new vcpkg releases.
+ * Automatic CI process for generating new vcpkg releases.
  * Based loosely on RealTimeChris's shell script version.
  * 
  * This updates the content of ./vcpkg directory within the DPP
@@ -28,7 +27,7 @@
  *    the script, failing the CI action.
  */
 
-require __DIR__ . '/Vendor/autoload.php';
+require __DIR__ . '/vendor/autoload.php';
 use DiscordCoreAPI\Packager\Vcpkg;
 
 $vcpkg = new Vcpkg();

BuildTools/composer.json

@@ -3,10 +3,10 @@
 // autoload.php @generated by Composer
 
 if (PHP_VERSION_ID < 50600) {
-    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "Composer self-update --2.2". Aborting.'.PHP_EOL;
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
     exit(1);
 }
 
-require_once __DIR__ . '/Composer/autoload_real.php';
+require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInit0e8415491642f27914717986db49b1db::getLoader();