Skip to content

Commit

Permalink
fix: downloads
Browse files Browse the repository at this point in the history
  • Loading branch information
Filip Richtarik committed Feb 3, 2024
1 parent aadc3a9 commit 15babb8
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 34 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:
- uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: javascript

- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/dependency-review-action@v3
- uses: actions/dependency-review-action@v4
4 changes: 2 additions & 2 deletions .github/workflows/test-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ jobs:
- uses: actions/checkout@v4

- name: Setup Hugo
uses: peaceiris/actions-hugo@v2.6.0
uses: peaceiris/actions-hugo@v2
with:
hugo-version: ${{ matrix.hugo-version }}
extended: ${{ matrix.extended }}

- name: Run hugo version
run: echo "::set-output name=hugo_version::$(hugo version)"
run: echo "hugo_version=$(hugo version)" >> $GITHUB_OUTPUT
id: hugo_version

- name: '${{ steps.hugo_version.outputs.hugo_version }}'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ jobs:
- uses: actions/checkout@v4

- name: Read .nvmrc
run: echo "::set-output name=NVMRC::$(cat .nvmrc)"
run: echo "NVMRC=$(cat .nvmrc)" >> $GITHUB_OUTPUT
id: nvm

- name: Setup Node
uses: actions/setup-node@v3.6.0
uses: actions/setup-node@v4
with:
node-version: '${{ steps.nvm.outputs.NVMRC }}'

Expand Down
6 changes: 3 additions & 3 deletions __tests__/get-arch.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import getArch from '../src/get-arch';

describe('getArch', () => {
test('processor architecture', () => {
expect(getArch('x64')).toBe('64bit');
expect(getArch('arm')).toBe('ARM');
expect(getArch('arm64')).toBe('ARM64');
expect(getArch('x64')).toBe('amd64');
expect(getArch('arm')).toBe('arm');
expect(getArch('arm64')).toBe('arm64');
});

test('exception', () => {
Expand Down
6 changes: 3 additions & 3 deletions __tests__/get-os.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import getOS from '../src/get-os';

describe('getOS', () => {
test('os type', () => {
expect(getOS('linux')).toBe('Linux');
expect(getOS('darwin')).toBe('macOS');
expect(getOS('win32')).toBe('Windows');
expect(getOS('linux')).toBe('linux');
expect(getOS('darwin')).toBe('darwin');
expect(getOS('win32')).toBe('windows');
});

test('exception', () => {
Expand Down
28 changes: 14 additions & 14 deletions __tests__/get-url.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ import getURL from '../src/get-url';

describe('getURL()', () => {
test('get a URL to an asset for each platform', () => {
const baseURL = 'https://github.com/gohugoio/hugo/releases/download/v0.58.2';
const urlLinux = `${baseURL}/hugo_0.58.2_Linux-64bit.tar.gz`;
const urlLinuxExtended = `${baseURL}/hugo_extended_0.58.2_Linux-64bit.tar.gz`;
const urlMacOS = `${baseURL}/hugo_0.58.2_macOS-64bit.tar.gz`;
const urlMacOSExtended = `${baseURL}/hugo_extended_0.58.2_macOS-64bit.tar.gz`;
const urlWindows = `${baseURL}/hugo_0.58.2_Windows-64bit.zip`;
expect(getURL('Linux', '64bit', 'false', '0.58.2')).toBe(urlLinux);
expect(getURL('Linux', '64bit', 'true', '0.58.2')).not.toBe(urlLinux);
expect(getURL('MyOS', '64bit', 'false', '0.58.2')).not.toBe(urlLinux);
expect(getURL('Linux', '64bit', 'false', '0.58.1')).not.toBe(urlLinux);
expect(getURL('Linux', '64bit', 'true', '0.58.2')).toBe(urlLinuxExtended);
expect(getURL('macOS', '64bit', 'false', '0.58.2')).toBe(urlMacOS);
expect(getURL('macOS', '64bit', 'true', '0.58.2')).toBe(urlMacOSExtended);
expect(getURL('Windows', '64bit', 'false', '0.58.2')).toBe(urlWindows);
const baseURL = 'https://github.com/gohugoio/hugo/releases/download/v0.122.0';
const urlLinux = `${baseURL}/hugo_0.122.0_linux-amd64.tar.gz`;
const urlLinuxExtended = `${baseURL}/hugo_extended_0.122.0_linux-amd64.tar.gz`;
const urlMacOS = `${baseURL}/hugo_0.122.0_darwin-universal.tar.gz`;
const urlMacOSExtended = `${baseURL}/hugo_extended_0.122.0_darwin-universal.tar.gz`;
const urlWindows = `${baseURL}/hugo_0.122.0_windows-amd64.zip`;
expect(getURL('linux', 'amd64', 'false', '0.122.0')).toBe(urlLinux);
expect(getURL('linux', 'amd64', 'true', '0.122.0')).not.toBe(urlLinux);
expect(getURL('MyOS', 'amd64', 'false', '0.122.0')).not.toBe(urlLinux);
expect(getURL('linux', 'amd64', 'false', '0.121.0')).not.toBe(urlLinux);
expect(getURL('linux', 'amd64', 'true', '0.122.0')).toBe(urlLinuxExtended);
expect(getURL('darwin', 'universal', 'false', '0.122.0')).toBe(urlMacOS);
expect(getURL('darwin', 'universal', 'true', '0.122.0')).toBe(urlMacOSExtended);
expect(getURL('windows', 'amd64', 'false', '0.122.0')).toBe(urlWindows);
});
});
8 changes: 5 additions & 3 deletions src/get-arch.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
export default function getArch(arch: string): string {
switch (arch) {
case 'x64':
return '64bit';
return 'amd64';
case 'arm':
return 'ARM';
return 'arm';
case 'arm64':
return 'ARM64';
return 'arm64';
case 'universal':
return 'universal';
default:
throw new Error(`${arch} is not supported`);
}
Expand Down
6 changes: 3 additions & 3 deletions src/get-os.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
export default function getOS(platform: string): string {
switch (platform) {
case 'linux':
return 'Linux';
return 'linux';
case 'darwin':
return 'macOS';
return 'darwin';
case 'win32':
return 'Windows';
return 'windows';
default:
throw new Error(`${platform} is not supported`);
}
Expand Down

0 comments on commit 15babb8

Please sign in to comment.