Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/action-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup NodeJS
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "16.x"
node-version: "24.x"

# Install and run tests
- name: Install
run: npm i
run: npm ci
- name: Lint
run: npm run lint
- name: Unit tests
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/update-tag-according-to-version.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: "Update Major Version Tag"
on:
release:
types: [published]

permissions:
contents: write

jobs:
update-tag:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Update floating major tag
run: |
RELEASE_TAG="${{ github.ref_name }}"
MAJOR_TAG=$(echo "$RELEASE_TAG" | grep -oE '^v[0-9]+')
echo "Moving $MAJOR_TAG → $RELEASE_TAG"
git tag -f "$MAJOR_TAG"
git push origin "$MAJOR_TAG" --force
19 changes: 0 additions & 19 deletions .github/workflows/update-v2-tag.yml

This file was deleted.

2 changes: 1 addition & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ inputs:
description: "By default, this is the URL of the GitHub repository owner, such as the organization that owns the repository."
required: false
runs:
using: "node16"
using: "node24"
main: "action/lib/main.js"
branding:
icon: "terminal"
Expand Down
6 changes: 5 additions & 1 deletion action/lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class Utils {
let major = version.split('.')[0];
if (version === this.LATEST_CLI_VERSION_ARG) {
version = Utils.LATEST_RELEASE_VERSION;
major = '2';
major = '3';
}
else {
if (this.loadFromCache(version)) {
Expand Down Expand Up @@ -106,6 +106,10 @@ class Utils {
const apiUrl = process.env.GITHUB_API_URL || github_1.context.apiUrl || 'https://api.github.com';
core.exportVariable('JF_GIT_API_ENDPOINT', apiUrl);
}
if (!process.env.JF_GIT_SERVER_URL) {
const serverUrl = process.env.GITHUB_SERVER_URL || 'https://github.com';
core.exportVariable('JF_GIT_SERVER_URL', serverUrl);
}
return github_1.context.eventName;
});
}
Expand Down
3 changes: 1 addition & 2 deletions action/node_modules/.package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions action/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions action/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jfrog/frogbot",
"version": "1.0.0",
"version": "3.0.0",
"private": true,
"description": "Scan for vulnerabilities in GitHub repositories",
"main": "lib/main.js",
Expand Down Expand Up @@ -39,9 +39,9 @@
"@actions/core": "~1.10.0",
"@actions/exec": "~1.1.1",
"@actions/github": "~5.1.1",
"@actions/http-client": "~2.2.1",
"@actions/tool-cache": "~2.0.1",
"simple-git": "^3.19.1",
"@actions/http-client": "~2.2.1"
"simple-git": "^3.19.1"
},
"devDependencies": {
"@types/jest": "^29.5.4",
Expand Down
7 changes: 6 additions & 1 deletion action/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export class Utils {
let major: string = version.split('.')[0];
if (version === this.LATEST_CLI_VERSION_ARG) {
version = Utils.LATEST_RELEASE_VERSION;
major = '2';
major = '3';
} else {
if (this.loadFromCache(version)) {
// Download is not needed
Expand Down Expand Up @@ -83,6 +83,11 @@ export class Utils {
core.exportVariable('JF_GIT_API_ENDPOINT', apiUrl);
}

if (!process.env.JF_GIT_SERVER_URL) {
const serverUrl: string = process.env.GITHUB_SERVER_URL || 'https://github.com';
core.exportVariable('JF_GIT_SERVER_URL', serverUrl);
}

return githubContext.eventName;
}

Expand Down
39 changes: 39 additions & 0 deletions action/test/main.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ describe('Frogbot Action Tests', () => {
delete process.env.JF_GIT_TOKEN;
delete process.env.JF_GIT_API_ENDPOINT;
delete process.env.GITHUB_API_URL;
delete process.env.JF_GIT_SERVER_URL;
delete process.env.GITHUB_SERVER_URL;
});

describe('Frogbot URL Tests', () => {
Expand Down Expand Up @@ -223,4 +225,41 @@ describe('Frogbot Action Tests', () => {
expect(process.env['JF_GIT_API_ENDPOINT']).toBe('https://custom.api.com');
});
});

describe('Auto-detect server URL', () => {
afterEach(() => {
delete process.env.JF_GIT_SERVER_URL;
delete process.env.GITHUB_SERVER_URL;
delete process.env.GITHUB_TOKEN;
delete process.env.GITHUB_REPOSITORY_OWNER;
delete process.env.GITHUB_REPOSITORY;
});

it('Should auto-detect JF_GIT_SERVER_URL from GITHUB_SERVER_URL', async () => {
process.env['GITHUB_SERVER_URL'] = 'https://myenterprise.github.com';
process.env['GITHUB_TOKEN'] = 'ghp_test_token';
process.env['GITHUB_REPOSITORY_OWNER'] = 'jfrog';
process.env['GITHUB_REPOSITORY'] = 'jfrog/frogbot';
await Utils.setFrogbotEnv();
expect(process.env['JF_GIT_SERVER_URL']).toBe('https://myenterprise.github.com');
});

it('Should default JF_GIT_SERVER_URL to https://github.com if GITHUB_SERVER_URL not set', async () => {
process.env['GITHUB_TOKEN'] = 'ghp_test_token';
process.env['GITHUB_REPOSITORY_OWNER'] = 'jfrog';
process.env['GITHUB_REPOSITORY'] = 'jfrog/frogbot';
await Utils.setFrogbotEnv();
expect(process.env['JF_GIT_SERVER_URL']).toBe('https://github.com');
});

it('Should use existing JF_GIT_SERVER_URL if already set', async () => {
process.env['JF_GIT_SERVER_URL'] = 'https://custom.server.com';
process.env['GITHUB_SERVER_URL'] = 'https://myenterprise.github.com';
process.env['GITHUB_TOKEN'] = 'ghp_test_token';
process.env['GITHUB_REPOSITORY_OWNER'] = 'jfrog';
process.env['GITHUB_REPOSITORY'] = 'jfrog/frogbot';
await Utils.setFrogbotEnv();
expect(process.env['JF_GIT_SERVER_URL']).toBe('https://custom.server.com');
});
});
});
Loading