Set main as the default branch (#527)

* set main as the default branch

* revert change to tool-cache default branch

* use versions where applicable
This commit is contained in:
Thomas Boop
2020-07-21 11:33:05 -04:00
committed by GitHub
parent cb18a3df6b
commit ccad19055e
25 changed files with 42 additions and 42 deletions
+1 -1
View File
@@ -203,6 +203,6 @@ Check out [implementation-details](docs/implementation-details.md) for extra inf
## Contributions
See [contributor guidelines](https://github.com/actions/toolkit/blob/master/.github/CONTRIBUTING.md) for general guidelines and information about toolkit contributions.
See [contributor guidelines](https://github.com/actions/toolkit/blob/main/.github/CONTRIBUTING.md) for general guidelines and information about toolkit contributions.
For contributions related to this package, see [artifact contributions](CONTRIBUTIONS.md) for more information.
+1 -1
View File
@@ -8,7 +8,7 @@
"actions",
"artifact"
],
"homepage": "https://github.com/actions/toolkit/tree/master/packages/artifact",
"homepage": "https://github.com/actions/toolkit/tree/main/packages/artifact",
"license": "MIT",
"main": "lib/artifact-client.js",
"types": "lib/artifact-client.d.ts",
+3 -3
View File
@@ -104,7 +104,7 @@ test('restore with gzip compressed cache found', async () => {
const cacheEntry: ArtifactCacheEntry = {
cacheKey: key,
scope: 'refs/heads/master',
scope: 'refs/heads/main',
archiveLocation: 'www.actionscache.test/download'
}
const getCacheMock = jest.spyOn(cacheHttpClient, 'getCacheEntry')
@@ -166,7 +166,7 @@ test('restore with zstd compressed cache found', async () => {
const cacheEntry: ArtifactCacheEntry = {
cacheKey: key,
scope: 'refs/heads/master',
scope: 'refs/heads/main',
archiveLocation: 'www.actionscache.test/download'
}
const getCacheMock = jest.spyOn(cacheHttpClient, 'getCacheEntry')
@@ -223,7 +223,7 @@ test('restore with cache found for restore key', async () => {
const cacheEntry: ArtifactCacheEntry = {
cacheKey: restoreKey,
scope: 'refs/heads/master',
scope: 'refs/heads/main',
archiveLocation: 'www.actionscache.test/download'
}
const getCacheMock = jest.spyOn(cacheHttpClient, 'getCacheEntry')
+1 -1
View File
@@ -8,7 +8,7 @@
"actions",
"cache"
],
"homepage": "https://github.com/actions/toolkit/tree/master/packages/cache",
"homepage": "https://github.com/actions/toolkit/tree/main/packages/cache",
"license": "MIT",
"main": "lib/cache.js",
"types": "lib/cache.d.ts",
+1 -1
View File
@@ -9,7 +9,7 @@ import * as util from 'util'
import {v4 as uuidV4} from 'uuid'
import {CacheFilename, CompressionMethod} from './constants'
// From https://github.com/actions/toolkit/blob/master/packages/tool-cache/src/tool-cache.ts#L23
// From https://github.com/actions/toolkit/blob/main/packages/tool-cache/src/tool-cache.ts#L23
export async function createTempDirectory(): Promise<string> {
const IS_WINDOWS = process.platform === 'win32'
+1 -1
View File
@@ -7,7 +7,7 @@
"actions",
"core"
],
"homepage": "https://github.com/actions/toolkit/tree/master/packages/core",
"homepage": "https://github.com/actions/toolkit/tree/main/packages/core",
"license": "MIT",
"main": "lib/core.js",
"types": "lib/core.d.ts",
+1 -1
View File
@@ -7,7 +7,7 @@
"actions",
"exec"
],
"homepage": "https://github.com/actions/toolkit/tree/master/packages/exec",
"homepage": "https://github.com/actions/toolkit/tree/main/packages/exec",
"license": "MIT",
"main": "lib/exec.js",
"types": "lib/exec.d.ts",
@@ -52,9 +52,9 @@ describe('@actions/github', () => {
const branch = await octokit.repos.getBranch({
owner: 'actions',
repo: 'toolkit',
branch: 'master'
branch: 'main'
})
expect(branch.data.name).toBe('master')
expect(branch.data.name).toBe('main')
expect(proxyConnects).toEqual(['api.github.com:443'])
})
@@ -88,9 +88,9 @@ describe('@actions/github', () => {
const branch = await octokit.repos.getBranch({
owner: 'actions',
repo: 'toolkit',
branch: 'master'
branch: 'main'
})
expect(branch.data.name).toBe('master')
expect(branch.data.name).toBe('main')
expect(proxyConnects).toHaveLength(0)
})
+7 -7
View File
@@ -48,9 +48,9 @@ describe('@actions/github', () => {
const branch = await octokit.repos.getBranch({
owner: 'actions',
repo: 'toolkit',
branch: 'master'
branch: 'main'
})
expect(branch.data.name).toBe('master')
expect(branch.data.name).toBe('main')
expect(proxyConnects).toHaveLength(0)
})
@@ -63,9 +63,9 @@ describe('@actions/github', () => {
const branch = await octokit.repos.getBranch({
owner: 'actions',
repo: 'toolkit',
branch: 'master'
branch: 'main'
})
expect(branch.data.name).toBe('master')
expect(branch.data.name).toBe('main')
expect(proxyConnects).toHaveLength(0)
})
@@ -80,9 +80,9 @@ describe('@actions/github', () => {
const branch = await octokit.repos.getBranch({
owner: 'actions',
repo: 'toolkit',
branch: 'master'
branch: 'main'
})
expect(branch.data.name).toBe('master')
expect(branch.data.name).toBe('main')
expect(proxyConnects).toHaveLength(0)
// Invalid token
@@ -92,7 +92,7 @@ describe('@actions/github', () => {
await octokit.repos.getBranch({
owner: 'actions',
repo: 'toolkit',
branch: 'master'
branch: 'main'
})
} catch (err) {
failed = true
+1 -1
View File
@@ -6,7 +6,7 @@
"github",
"actions"
],
"homepage": "https://github.com/actions/toolkit/tree/master/packages/github",
"homepage": "https://github.com/actions/toolkit/tree/main/packages/github",
"license": "MIT",
"main": "lib/github.js",
"types": "lib/github.d.ts",
+1 -1
View File
@@ -1,4 +1,4 @@
// Originally pulled from https://github.com/JasonEtco/actions-toolkit/blob/master/src/context.ts
// Originally pulled from https://github.com/JasonEtco/actions-toolkit/blob/main/src/context.ts
import {WebhookPayload} from './interfaces'
import {readFileSync, existsSync} from 'fs'
import {EOL} from 'os'
+1 -1
View File
@@ -8,7 +8,7 @@
"actions",
"glob"
],
"homepage": "https://github.com/actions/toolkit/tree/master/packages/glob",
"homepage": "https://github.com/actions/toolkit/tree/main/packages/glob",
"license": "MIT",
"main": "lib/glob.js",
"types": "lib/glob.d.ts",
+1 -1
View File
@@ -7,7 +7,7 @@
"actions",
"io"
],
"homepage": "https://github.com/actions/toolkit/tree/master/packages/io",
"homepage": "https://github.com/actions/toolkit/tree/main/packages/io",
"license": "MIT",
"main": "lib/io.js",
"types": "lib/io.d.ts",
@@ -8,7 +8,7 @@ import osm = require('os')
import cp = require('child_process')
//import {coerce} from 'semver'
// we fetch the manifest file from master of a repo
// we fetch the manifest file from main of a repo
const owner = 'actions'
const repo = 'some-tool'
const fakeToken = 'notrealtoken'
+1 -1
View File
@@ -7,7 +7,7 @@
"actions",
"exec"
],
"homepage": "https://github.com/actions/toolkit/tree/master/packages/tool-cache",
"homepage": "https://github.com/actions/toolkit/tree/main/packages/tool-cache",
"license": "MIT",
"main": "lib/tool-cache.js",
"types": "lib/tool-cache.d.ts",