Skip to content

Commit 30a5d28

Browse files
committed
API URL bug fix
1 parent c88c29e commit 30a5d28

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

bin/automerge.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const OLD_CONFIG = [
2121
"TOKEN"
2222
];
2323

24-
const GITHUB_SERVER_URL = process.env.GITHUB_SERVER_URL;
24+
const GITHUB_API_URL = process.env.GITHUB_API_URL || "https://api.github.com";
2525

2626
async function main() {
2727
const parser = new ArgumentParser({
@@ -55,7 +55,7 @@ async function main() {
5555
const token = env("GITHUB_TOKEN");
5656

5757
const octokit = new Octokit({
58-
baseUrl: GITHUB_SERVER_URL,
58+
baseUrl: GITHUB_API_URL,
5959
auth: `token ${token}`,
6060
userAgent: "pascalgn/automerge-action"
6161
});

dist/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44089,7 +44089,7 @@ module.exports = parseParams
4408944089
/***/ ((module) => {
4409044090

4409144091
"use strict";
44092-
module.exports = JSON.parse('{"name":"automerge-action","version":"0.16.1","description":"GitHub action to automatically merge pull requests","main":"lib/api.js","author":"Pascal","license":"MIT","private":true,"bin":{"automerge-action":"./bin/automerge.js"},"scripts":{"test":"jest","it":"node it/it.js","lint":"prettier -l lib/** test/** && eslint .","compile":"ncc build bin/automerge.js --license LICENSE -o dist","prepublish":"yarn lint && yarn test && yarn compile"},"dependencies":{"@actions/core":"^1.10.1","@octokit/rest":"^20.0.2","argparse":"^2.0.1","fs-extra":"^11.2.0","object-resolve-path":"^1.1.1","tmp":"^0.2.1"},"devDependencies":{"@vercel/ncc":"^0.38.1","dotenv":"^16.3.1","eslint":"^8.56.0","eslint-plugin-jest":"^27.6.1","jest":"^29.7.0","prettier":"^3.1.1"},"prettier":{"trailingComma":"none","arrowParens":"avoid"}}');
44092+
module.exports = JSON.parse('{"name":"automerge-action","version":"0.16.2","description":"GitHub action to automatically merge pull requests","main":"lib/api.js","author":"Pascal","license":"MIT","private":true,"bin":{"automerge-action":"./bin/automerge.js"},"scripts":{"test":"jest","it":"node it/it.js","lint":"prettier -l lib/** test/** && eslint .","compile":"ncc build bin/automerge.js --license LICENSE -o dist","prepublish":"yarn lint && yarn test && yarn compile"},"dependencies":{"@actions/core":"^1.10.1","@octokit/rest":"^20.0.2","argparse":"^2.0.1","fs-extra":"^11.2.0","object-resolve-path":"^1.1.1","tmp":"^0.2.1"},"devDependencies":{"@vercel/ncc":"^0.38.1","dotenv":"^16.3.1","eslint":"^8.56.0","eslint-plugin-jest":"^27.6.1","jest":"^29.7.0","prettier":"^3.1.1"},"prettier":{"trailingComma":"none","arrowParens":"avoid"}}');
4409344093

4409444094
/***/ })
4409544095

@@ -44156,7 +44156,7 @@ const OLD_CONFIG = [
4415644156
"TOKEN"
4415744157
];
4415844158

44159-
const GITHUB_SERVER_URL = process.env.GITHUB_SERVER_URL;
44159+
const GITHUB_API_URL = process.env.GITHUB_API_URL || "https://api.github.com";
4416044160

4416144161
async function main() {
4416244162
const parser = new ArgumentParser({
@@ -44190,7 +44190,7 @@ async function main() {
4419044190
const token = env("GITHUB_TOKEN");
4419144191

4419244192
const octokit = new Octokit({
44193-
baseUrl: GITHUB_SERVER_URL,
44193+
baseUrl: GITHUB_API_URL,
4419444194
auth: `token ${token}`,
4419544195
userAgent: "pascalgn/automerge-action"
4419644196
});

it/it.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ async function main() {
99
const token = process.env.GITHUB_TOKEN;
1010

1111
const octokit = new Octokit({
12+
baseUrl: "https://api.github.com",
1213
auth: `token ${token}`,
1314
userAgent: "pascalgn/automerge-action-it"
1415
});

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "automerge-action",
3-
"version": "0.16.1",
3+
"version": "0.16.2",
44
"description": "GitHub action to automatically merge pull requests",
55
"main": "lib/api.js",
66
"author": "Pascal",

0 commit comments

Comments
 (0)