Skip to content

Commit daece92

Browse files
tgymnichtgymnich
committedDec 21, 2019
Added macOS support
·
v1.0.9v1
1 parent d07ca8d commit daece92

File tree

7 files changed

+129
-47
lines changed

7 files changed

+129
-47
lines changed
 

‎.github/workflows/test.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@ on: # rebuild any PRs and main branch changes
88

99
jobs:
1010
build: # make sure build/ci work properly
11-
runs-on: ubuntu-latest
11+
runs-on: macOS-latest
1212
steps:
1313
- uses: actions/checkout@v2
1414
- run: |
1515
npm install
1616
npm run all
1717
test: # make sure the action works on a clean machine without building
18-
runs-on: ubuntu-latest
18+
runs-on: macOS-latest
1919
steps:
2020
- uses: actions/checkout@v2
2121
- uses: ./
2222
with:
2323
version: '5.1.3'
24-
platform: 'ubuntu18.04'
24+
platform: 'osx'
2525
- run: swift --version
2626
publish:
27-
runs-on: ubuntu-latest
27+
runs-on: macOS-latest
2828
steps:
2929
- uses: actions/checkout@v2
3030
- uses: TG908/publish-github-action@v1

‎__tests__/installer.test.ts

+3-34
Original file line numberDiff line numberDiff line change
@@ -19,38 +19,7 @@ let swiftUrl =
1919
'https://swift.org/builds/swift-5.0.2-release/ubuntu1804/swift-5.0.2-RELEASE/swift-5.0.2-RELEASE-ubuntu18.04.tar.gz'
2020

2121
describe('installer tests', () => {
22-
beforeAll(async () => {
23-
await io.rmRF(toolDir)
24-
await io.rmRF(tempDir)
25-
if (!fs.existsSync(`${swiftFilePath}.complete`)) {
26-
// Download swift
27-
await io.mkdirP(swiftDir)
28-
29-
console.log('Downloading swift')
30-
child_process.execSync(`curl "${swiftUrl}" > "${swiftFilePath}"`)
31-
// Write complete file so we know it was successful
32-
fs.writeFileSync(`${swiftFilePath}.complete`, 'content')
33-
}
34-
}, 10000000)
35-
36-
afterAll(async () => {
37-
try {
38-
//await io.rmRF(toolDir);
39-
//await io.rmRF(tempDir);
40-
} catch {
41-
console.log('Failed to remove test directories')
42-
}
43-
}, 100000)
44-
45-
it('Installs release version of Swift if no matching version is installed', async () => {
46-
await installer.getSwift('5.0.2', 'ubuntu18.04')
47-
48-
const SwiftDir = path.join(
49-
toolDir,
50-
'Swift',
51-
'swift-5.0.2-RELEASE:swift-5.0.2-release',
52-
'ubuntu18.04'
53-
)
54-
expect(fs.existsSync(path.join(SwiftDir, 'usr', 'bin'))).toBe(true)
55-
}, 10000000)
22+
it('', () => {
23+
/* this file contains test utilitlies */
24+
})
5625
})

‎action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 'Setup Swift environment'
1+
name: 'Setup Swift Action'
22
description: 'Setup a Swift environment'
33
author: 'TG908'
44
branding:
@@ -12,7 +12,7 @@ inputs:
1212
platform:
1313
description: 'Platform'
1414
required: true
15-
default: 'ubuntu18.04'
15+
default: 'osx'
1616
runs:
1717
using: 'node12'
1818
main: 'dist/index.js'

‎dist/index.js

+49-3
Original file line numberDiff line numberDiff line change
@@ -4562,8 +4562,21 @@ var __importStar = (this && this.__importStar) || function (mod) {
45624562
Object.defineProperty(exports, "__esModule", { value: true });
45634563
const core = __importStar(__webpack_require__(470));
45644564
const tc = __importStar(__webpack_require__(533));
4565+
const exec = __importStar(__webpack_require__(986));
4566+
const io = __importStar(__webpack_require__(1));
45654567
const path = __importStar(__webpack_require__(622));
45664568
function getSwift(version, platform) {
4569+
return __awaiter(this, void 0, void 0, function* () {
4570+
if (platform === 'osx') {
4571+
return getSwiftMacOS(version, platform);
4572+
}
4573+
else {
4574+
return getSwiftLinux(version, platform);
4575+
}
4576+
});
4577+
}
4578+
exports.getSwift = getSwift;
4579+
function getSwiftLinux(version, platform) {
45674580
return __awaiter(this, void 0, void 0, function* () {
45684581
const swiftBranch = `swift-${version}-release`;
45694582
const swiftVersion = `swift-${version}-RELEASE`;
@@ -4577,16 +4590,49 @@ function getSwift(version, platform) {
45774590
const swiftUrl = `https://swift.org/builds/${swiftBranch}/${platform.replace(re, '')}/${swiftVersion}/${swiftVersion}-${platform}.tar.gz`;
45784591
const swiftArchive = yield tc.downloadTool(swiftUrl);
45794592
let swiftDirectory = yield tc.extractTar(swiftArchive, undefined, 'xpz');
4580-
const folderName = `${swiftVersion}-${platform}`;
4581-
swiftDirectory = path.join(swiftDirectory, folderName);
4593+
swiftDirectory = path.join(swiftDirectory, `${swiftVersion}-${platform}`);
45824594
core.debug(`Swift extracted to ${swiftDirectory}`);
45834595
toolPath = yield tc.cacheDir(swiftDirectory, 'Swift', version, platform);
45844596
}
45854597
const swiftBin = path.join(toolPath, 'usr', 'bin');
45864598
core.addPath(swiftBin);
45874599
});
45884600
}
4589-
exports.getSwift = getSwift;
4601+
function getSwiftMacOS(version, platform) {
4602+
return __awaiter(this, void 0, void 0, function* () {
4603+
const swiftBranch = `swift-${version}-release`;
4604+
const swiftVersion = `swift-${version}-RELEASE`;
4605+
let toolPath = tc.find('Swift', version, platform);
4606+
if (toolPath) {
4607+
core.debug(`Tool found in cache ${toolPath}`);
4608+
}
4609+
else {
4610+
core.debug('Downloading Swift');
4611+
const swiftURL = `https://swift.org/builds/${swiftBranch}/xcode/${swiftVersion}/${swiftVersion}-osx.pkg`;
4612+
const swiftPkg = yield tc.downloadTool(swiftURL);
4613+
const pkgPath = path.join(path.dirname(swiftPkg), `${swiftVersion}-extracted-package`);
4614+
yield io.mkdirP(pkgPath);
4615+
yield exec.exec('xar', ['-xf', swiftPkg, '-C', pkgPath]);
4616+
const swiftPayload = path.join(pkgPath, `${swiftVersion}-osx-package.pkg/Payload`);
4617+
const toolchain = path.join(path.dirname(swiftPkg), `${swiftVersion}.xctoolchain`);
4618+
yield io.mkdirP(toolchain);
4619+
const swiftDirectory = yield tc.extractTar(swiftPayload, toolchain);
4620+
toolPath = yield tc.cacheDir(swiftDirectory, 'Swift', version, 'osx');
4621+
}
4622+
let stdOut = '';
4623+
const options = {
4624+
listeners: {
4625+
stdout: (data) => {
4626+
stdOut += data.toString();
4627+
}
4628+
}
4629+
};
4630+
yield exec.exec(`sudo mkdir -p /Library/Developer/Toolchains/${swiftVersion}.xctoolchain`);
4631+
yield exec.exec(`sudo cp -R ${toolPath}/ /Library/Developer/Toolchains/${swiftVersion}.xctoolchain`);
4632+
yield exec.exec(`/usr/libexec/PlistBuddy -c "Print :CFBundleIdentifier" /Library/Developer/Toolchains/${swiftVersion}.xctoolchain/Info.plist`, [], options);
4633+
core.exportVariable('TOOLCHAINS', stdOut);
4634+
});
4635+
}
45904636

45914637

45924638
/***/ }),

‎package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "setup-swift-action",
3-
"version": "0.0.1",
3+
"version": "0.0.3",
44
"private": true,
55
"description": "Setup a Swift environment",
66
"main": "lib/main.js",
@@ -27,6 +27,7 @@
2727
"dependencies": {
2828
"@actions/core": "^1.2.0",
2929
"@actions/exec": "^1.0.2",
30+
"@actions/io": "^1.0.1",
3031
"@actions/tool-cache": "^1.1.2"
3132
},
3233
"devDependencies": {

‎src/installer.ts

+68-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11
import * as core from '@actions/core'
22
import * as tc from '@actions/tool-cache'
3+
import * as exec from '@actions/exec'
4+
import * as io from '@actions/io'
35
import * as path from 'path'
46

57
export async function getSwift(
68
version: string,
79
platform: string
810
): Promise<void> {
11+
if (platform === 'osx') {
12+
return getSwiftMacOS(version, platform)
13+
} else {
14+
return getSwiftLinux(version, platform)
15+
}
16+
}
17+
18+
async function getSwiftLinux(version: string, platform: string): Promise<void> {
919
const swiftBranch = `swift-${version}-release`
1020
const swiftVersion = `swift-${version}-RELEASE`
1121
let toolPath = tc.find('Swift', version, platform)
@@ -21,8 +31,7 @@ export async function getSwift(
2131
)}/${swiftVersion}/${swiftVersion}-${platform}.tar.gz`
2232
const swiftArchive: string = await tc.downloadTool(swiftUrl)
2333
let swiftDirectory = await tc.extractTar(swiftArchive, undefined, 'xpz')
24-
const folderName = `${swiftVersion}-${platform}`
25-
swiftDirectory = path.join(swiftDirectory, folderName)
34+
swiftDirectory = path.join(swiftDirectory, `${swiftVersion}-${platform}`)
2635

2736
core.debug(`Swift extracted to ${swiftDirectory}`)
2837
toolPath = await tc.cacheDir(swiftDirectory, 'Swift', version, platform)
@@ -32,3 +41,60 @@ export async function getSwift(
3241

3342
core.addPath(swiftBin)
3443
}
44+
45+
async function getSwiftMacOS(version: string, platform: string): Promise<void> {
46+
const swiftBranch = `swift-${version}-release`
47+
const swiftVersion = `swift-${version}-RELEASE`
48+
49+
let toolPath = tc.find('Swift', version, platform)
50+
51+
if (toolPath) {
52+
core.debug(`Tool found in cache ${toolPath}`)
53+
} else {
54+
core.debug('Downloading Swift')
55+
56+
const swiftURL = `https://swift.org/builds/${swiftBranch}/xcode/${swiftVersion}/${swiftVersion}-osx.pkg`
57+
const swiftPkg: string = await tc.downloadTool(swiftURL)
58+
const pkgPath = path.join(
59+
path.dirname(swiftPkg),
60+
`${swiftVersion}-extracted-package`
61+
)
62+
await io.mkdirP(pkgPath)
63+
await exec.exec('xar', ['-xf', swiftPkg, '-C', pkgPath])
64+
const swiftPayload = path.join(
65+
pkgPath,
66+
`${swiftVersion}-osx-package.pkg/Payload`
67+
)
68+
const toolchain = path.join(
69+
path.dirname(swiftPkg),
70+
`${swiftVersion}.xctoolchain`
71+
)
72+
await io.mkdirP(toolchain)
73+
const swiftDirectory = await tc.extractTar(swiftPayload, toolchain)
74+
toolPath = await tc.cacheDir(swiftDirectory, 'Swift', version, 'osx')
75+
}
76+
77+
let stdOut = ''
78+
79+
const options = {
80+
listeners: {
81+
stdout: (data: Buffer) => {
82+
stdOut += data.toString()
83+
}
84+
}
85+
}
86+
87+
await exec.exec(
88+
`sudo mkdir -p /Library/Developer/Toolchains/${swiftVersion}.xctoolchain`
89+
)
90+
await exec.exec(
91+
`sudo cp -R ${toolPath}/ /Library/Developer/Toolchains/${swiftVersion}.xctoolchain`
92+
)
93+
await exec.exec(
94+
`/usr/libexec/PlistBuddy -c "Print :CFBundleIdentifier" /Library/Developer/Toolchains/${swiftVersion}.xctoolchain/Info.plist`,
95+
[],
96+
options
97+
)
98+
99+
core.exportVariable('TOOLCHAINS', stdOut)
100+
}

0 commit comments

Comments
 (0)
Please sign in to comment.