5.3.0 (#21)

* perf: remove calc repo size because of github's changes https://github.blog/2024-01-17-github-hosted-runners-double-the-power-for-open-source/ * chore: add CPU checker * chore: update version * docs: update readme
List-KR · Jan 29, 2024 · 48f7856 · 48f7856
1 parent 22f4ccb
commit 48f7856
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 161 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -11,7 +11,6 @@ module.exports = {
 				'xo-typescript',
 			],
 			files: [
-				'calc-repo-size/**/*.ts',
 				'sources/**/*.ts',
 				'index.ts'
 			],

diff --git a/README.md b/README.md
@@ -18,8 +18,12 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Run jsDelivr-Purge
-        uses: List-KR/jsdelivr-purge@5.1.0
+        uses: List-KR/jsdelivr-purge@5.3.0
 ```
 
 The jsDelivr-Purge supports `workflow_dispatch`, `schedule` and `push` event.

diff --git a/action.yml b/action.yml
@@ -16,22 +16,6 @@ runs:
         npm i
       shell: bash
       working-directory: ${{ github.action_path }}
-    - name: Check if size of the repo exceeds the runner's hardware capacity
-      id: check_size
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-        REPO: ${{ github.repository }}
-        CI_WORKSPACE_PATH: ${{ github.workspace }}
-      run: |
-        npm run calc-repo-size -- --gh-token "$GITHUB_TOKEN" --repo "$REPO" --ci-workspace-path "$CI_WORKSPACE_PATH"
-      shell: bash
-      working-directory: ${{ github.action_path }}
-    - name: Clone repo into github.workspace
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-        ref: ${{ github.event.repository.default_branch }}
-      if: ${{  steps.check_size.outputs.should_api != 'true' }}
     - name: Run program
       env:
         GITHUB_TOKEN: ${{ github.token }}
@@ -40,8 +24,7 @@ runs:
         WORKFLOWREF: ${{ github.workflow_ref }}
         CI_WORKSPACE_PATH: ${{ github.workspace }}
         CI_ACTION_PATH: ${{ github.action_path }}
-        SHOULD_USE_API: ${{ steps.check_size.outputs.should_use_api }}
       run: |
-        npm run ci -- --gh-token "$GITHUB_TOKEN" --repo "$REPO" --workflow-ref "$WORKFLOWREF" --branch "$BRANCHE" --ci-workspace-path "$CI_WORKSPACE_PATH" --ci-action-path "$CI_ACTION_PATH" --should-use-api "$SHOULD_USE_API"
+        npm run ci -- --gh-token "$GITHUB_TOKEN" --repo "$REPO" --workflow-ref "$WORKFLOWREF" --branch "$BRANCHE" --ci-workspace-path "$CI_WORKSPACE_PATH" --ci-action-path "$CI_ACTION_PATH"
       shell: bash
       working-directory: ${{ github.action_path }}
diff --git a/calc-repo-size/index.ts b/calc-repo-size/index.ts
diff --git a/index.ts b/index.ts
@@ -6,6 +6,10 @@ import {GetLatestWorkflowTime} from './sources/actions.js'
 import {ListBranches} from './sources/branches.js'
 import {CommitManager} from './sources/commits.js'
 import {PurgeRequestManager} from './sources/requests.js'
+import * as Actions from '@actions/core'
+import * as Os from 'node:os'
+
+Actions.info(`Running on ${Os.cpus()[0].model} with ${Os.cpus().length} threads/vCPUs.`)
 
 const Program = new Commander.Command()
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jsdelivr-purge",
-  "version": "5.1.1",
+  "version": "5.3.0",
   "author": {
     "name": "PiQuark6046",
     "email": "piquark6046@proton.me",
@@ -17,16 +17,14 @@
   "license": "MIT",
   "type": "module",
   "scripts": {
-    "ci": "tsx index.ts",
-    "calc-repo-size": "tsx calc-repo-size/index.ts"
+    "ci": "tsx index.ts"
   },
   "dependencies": {
     "@actions/core": "^1.10.1",
     "@octokit/rest": "^20.0.2",
     "@types/luxon": "^3.4.2",
     "@types/node": "^20.11.7",
     "commander": "^11.1.0",
-    "diskusage": "^1.2.0",
     "got": "^14.0.0",
     "luxon": "^3.4.4",
     "p-queue": "^8.0.1",

diff --git a/sources/branches.ts b/sources/branches.ts
@@ -23,22 +23,11 @@ function CreateGitInstance(BasePath: string): Git.SimpleGit {
  */
 export async function ListBranches(ProgramOptions: Types.ProgramOptionsType): Promise<string[]> {
 	const Branches: string[] = ['latest']
-	if (ProgramOptions.shouldUseApi) {
-		const GitHubInstance = CreateGitHubInstance(ProgramOptions)
-		const [RepoOwner, RepoName] = ProgramOptions.repo.split('/')
-		Branches.push((await GitHubInstance.repos.get({owner: RepoOwner, repo: RepoName})).data.default_branch)
-		const OtherBranches = (await GitHubInstance.repos.listBranches({owner: RepoOwner, repo: RepoName}).then(Branches => Branches.data))
-			.map(Item => Item.name)
-		OtherBranches.forEach(Item => Branches.push(ProgramOptions.branch.split(' ').find(Branch => Branch === Item)))
-	}
-
-	if (!ProgramOptions.shouldUseApi) {
-		const GitInstance = CreateGitInstance(ProgramOptions.ciWorkspacePath)
-		Branches.push(await GitInstance.branchLocal().then(Branches => Branches.current))
-		// Branches[1] is always the current/default branch.
-		const OtherBranches = (await GitInstance.branchLocal().then(Branches => Branches.all)).filter(Branch => Branch !== Branches[1])
-		OtherBranches.forEach(Item => Branches.push(ProgramOptions.branch.split(' ').find(Branch => Branch === Item)))
-	}
+	const GitInstance = CreateGitInstance(ProgramOptions.ciWorkspacePath)
+	Branches.push(await GitInstance.branchLocal().then(Branches => Branches.current))
+	// Branches[1] is always the current/default branch.
+	const OtherBranches = (await GitInstance.branchLocal().then(Branches => Branches.all)).filter(Branch => Branch !== Branches[1])
+	OtherBranches.forEach(Item => Branches.push(ProgramOptions.branch.split(' ').find(Branch => Branch === Item)))
 
 	if (IsDebug(ProgramOptions)) {
 		Actions.debug(`ListBranches in branches.ts called: ${JSON.stringify(Branches)}`)

diff --git a/sources/commits.ts b/sources/commits.ts
@@ -26,57 +26,27 @@ export class CommitManager {
 	 */
 	async GetCommitSHAFromLatestWorkflowTime(LatestWorkflowRunTime: number, Branch: string): Promise<Types.CommitSHA> {
 		var MatchedCommitTimeAddress = 0
-		if (this.ProgramOptions.shouldUseApi) {
-			const GitHubInstance = CreateGitHubInstance(this.ProgramOptions)
-			const GitHubListCommits = await GitHubInstance.repos.listCommits({
-				owner: this.ProgramOptions.repo.split('/')[0],
-				repo: this.ProgramOptions.repo.split('/')[1],
-				sha: Branch === 'latest' ? this.Branches[1] : Branch,
-			}).then(Response => Response.data)
-			for (const CommitRaw of GitHubListCommits) {
-				if (DateTime.fromISO(CommitRaw.commit.author.date).toMillis() < LatestWorkflowRunTime) {
-					break
-				}
-
-				MatchedCommitTimeAddress++
-			}
-
-			// If any commit is pushed after the latest workflow time, skip the branch.
-			if (MatchedCommitTimeAddress === 0) {
-				return {sha: '', length: 0}
-			}
-
-			// If the wokflow had not executed before, return SHA of the oldest commit.
-			if (LatestWorkflowRunTime === 0) {
-				return {sha: GitHubListCommits[GitHubListCommits.length - 1].sha, length: GitHubListCommits.length}
+		const GitInstance = CreateGitInstance(this.ProgramOptions.ciWorkspacePath)
+		const GitLog = (await GitInstance.log(['--date=iso-strict'])).all
+		for (const CommitRaw of GitLog) {
+			if (DateTime.fromISO(CommitRaw.date).toMillis() < LatestWorkflowRunTime) {
+				break
 			}
 
-			return {sha: GitHubListCommits[MatchedCommitTimeAddress].sha, length: GitHubListCommits.length}
+			MatchedCommitTimeAddress++
 		}
 
-		if (!this.ProgramOptions.shouldUseApi) {
-			const GitInstance = CreateGitInstance(this.ProgramOptions.ciWorkspacePath)
-			const GitLog = (await GitInstance.log(['--date=iso-strict'])).all
-			for (const CommitRaw of GitLog) {
-				if (DateTime.fromISO(CommitRaw.date).toMillis() < LatestWorkflowRunTime) {
-					break
-				}
-
-				MatchedCommitTimeAddress++
-			}
-
-			// If any commit is pushed after the latest workflow time, skip the branch.
-			if (MatchedCommitTimeAddress === 0) {
-				return {sha: '', length: 0}
-			}
-
-			// If the wokflow had not executed before, return SHA of the oldest commit.
-			if (LatestWorkflowRunTime === 0) {
-				return {sha: GitLog[GitLog.length - 1].hash, length: GitLog.length}
-			}
+		// If any commit is pushed after the latest workflow time, skip the branch.
+		if (MatchedCommitTimeAddress === 0) {
+			return {sha: '', length: 0}
+		}
 
-			return {sha: GitLog[MatchedCommitTimeAddress].hash, length: GitLog.length}
+		// If the wokflow had not executed before, return SHA of the oldest commit.
+		if (LatestWorkflowRunTime === 0) {
+			return {sha: GitLog[GitLog.length - 1].hash, length: GitLog.length}
 		}
+
+		return {sha: GitLog[MatchedCommitTimeAddress].hash, length: GitLog.length}
 	}
 
 	/**
@@ -87,22 +57,9 @@ export class CommitManager {
 	 * @returns {Promise<string[]>} A list of changed files.
 	 */
 	async GetChangedFilesFromSHAToHead(CommitSHA: string, Branch: string): Promise<string[]> {
-		if (this.ProgramOptions.shouldUseApi) {
-			const GitHubInstance = CreateGitHubInstance(this.ProgramOptions)
-			const GitHubComparingRaw = await GitHubInstance.repos.compareCommits({
-				owner: this.ProgramOptions.repo.split('/')[0],
-				repo: this.ProgramOptions.repo.split('/')[1],
-				head: Branch === 'latest' ? this.Branches[1] : Branch,
-				base: CommitSHA,
-			}).then(Response => Response.data)
-			return GitHubComparingRaw.files.map(File => File.filename)
-		}
-
-		if (!this.ProgramOptions.shouldUseApi) {
-			const GitInstance = CreateGitInstance(this.ProgramOptions.ciWorkspacePath)
-			const ChangedFiles = (await GitInstance.diff(['--name-only', `${CommitSHA}...${Branch === 'latest' ? this.Branches[1] : Branch}`])).split('\n')
-			return ChangedFiles[ChangedFiles.length - 1] === '' ? ChangedFiles.slice(0, ChangedFiles.length - 1) : ChangedFiles
-		}
+		const GitInstance = CreateGitInstance(this.ProgramOptions.ciWorkspacePath)
+		const ChangedFiles = (await GitInstance.diff(['--name-only', `${CommitSHA}...${Branch === 'latest' ? this.Branches[1] : Branch}`])).split('\n')
+		return ChangedFiles[ChangedFiles.length - 1] === '' ? ChangedFiles.slice(0, ChangedFiles.length - 1) : ChangedFiles
 	}
 
 	/**
@@ -112,22 +69,10 @@ export class CommitManager {
 	 * @returns {Promise<string[]>} A list of changed files.
 	 */
 	async GetChangedFilesFromACommit(CommitSHA: string): Promise<string[]> {
-		if (this.ProgramOptions.shouldUseApi) {
-			const GitHubInstance = CreateGitHubInstance(this.ProgramOptions)
-			const GitHubComparingRaw = await GitHubInstance.repos.getCommit({
-				owner: this.ProgramOptions.repo.split('/')[0],
-				repo: this.ProgramOptions.repo.split('/')[1],
-				ref: CommitSHA,
-			}).then(Response => Response.data)
-			return GitHubComparingRaw.files.map(File => `/gh/${File.filename}`)
-		}
-
-		if (!this.ProgramOptions.shouldUseApi) {
-			const GitInstance = CreateGitInstance(this.ProgramOptions.ciWorkspacePath)
-			const ChangedFiles = (await GitInstance.show(['--pretty=format:"%f"', '--name-only', CommitSHA])).split('\n')
-			ChangedFiles.shift() // Remove the commit message.
-			ChangedFiles.pop()
-			return ChangedFiles
-		}
+		const GitInstance = CreateGitInstance(this.ProgramOptions.ciWorkspacePath)
+		const ChangedFiles = (await GitInstance.show(['--pretty=format:"%f"', '--name-only', CommitSHA])).split('\n')
+		ChangedFiles.shift() // Remove the commit message.
+		ChangedFiles.pop()
+		return ChangedFiles
 	}
 }
diff --git a/sources/types.ts b/sources/types.ts
@@ -7,7 +7,6 @@ export type ProgramOptionsRawType = {
 	branch: string;
 	ciWorkspacePath: string;
 	ciActionPath: string;
-	shouldUseApi: 'true' | 'false';
 }
 
 export type ProgramOptionsType = {
@@ -18,7 +17,6 @@ export type ProgramOptionsType = {
 	branch: string;
 	ciWorkspacePath: string;
 	ciActionPath: string;
-	shouldUseApi: boolean;
 }
 
 export type CDNStatusResponseType = {

diff --git a/tsconfig.json b/tsconfig.json
@@ -10,7 +10,6 @@
   },
   "include": [
     "index.ts",
-    "sources/**/*.ts",
-    "calc-repo-size/**/*.ts"
+    "sources/**/*.ts"
   ]
 }