Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

.github, fetch-configlet: rename release assets #705

Merged
merged 6 commits into from
Nov 11, 2022
Merged

.github, fetch-configlet: rename release assets #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
836a753
fetch-configlet, .github: rename `mac` to `macos`
ee7 Nov 5, 2022
89191e8
fetch-configlet, .github(create-artifact): rename `tgz` to `tar.gz`
ee7 Nov 5, 2022
646b220
fetch-configlet, .github(workflows): rename `64bit` to `x86-64`
ee7 Nov 5, 2022
2878ce2
fetch-configlet, .github(create-artifact): delimit with underscore
ee7 Nov 5, 2022
342d248
.github(create-artifact): add version to release asset filenames
ee7 Nov 5, 2022
13f1bfb
fetch-configlet.ps1: support version string in asset name
ee7 Nov 5, 2022
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
7 changes: 4 additions & 3 deletions .github/bin/create-artifact
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ artifacts_dir='artifacts'
mkdir -p "${artifacts_dir}"

binary_name='configlet'
build_tag="${GITHUB_REF_NAME}"

case "${OS}" in
windows)
artifact_file="${artifacts_dir}/${binary_name}-${OS}-${ARCH}.zip"
artifact_file="${artifacts_dir}/${binary_name}_${build_tag}_${OS}_${ARCH}.zip"
7z a "${artifact_file}" "${binary_name}.exe"
;;
linux | mac)
artifact_file="${artifacts_dir}/${binary_name}-${OS}-${ARCH}.tgz"
linux | macos)
artifact_file="${artifacts_dir}/${binary_name}_${build_tag}_${OS}_${ARCH}.tar.gz"
tar -cvzf "${artifact_file}" "${binary_name}"
;;
esac
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ jobs:
include:
- os: linux
runs-on: ubuntu-22.04
arch: 64bit
arch: x86-64

- os: mac
- os: macos
runs-on: macos-12
arch: 64bit
arch: x86-64

- os: windows
runs-on: windows-2022
arch: 64bit
arch: x86-64

name: "${{ matrix.os }}-${{ matrix.arch }}"
runs-on: ${{ matrix.runs-on }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fetch-configlet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- os: linux
runs-on: ubuntu-22.04

- os: mac
- os: macos
runs-on: macos-12

- os: windows
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ jobs:
include:
- os: linux
runs-on: ubuntu-22.04
arch: 64bit
arch: x86-64

- os: mac
- os: macos
runs-on: macos-12
arch: 64bit
arch: x86-64

- os: windows
runs-on: windows-2022
arch: 64bit
arch: x86-64

name: "${{ matrix.os }}-${{ matrix.arch }}"
runs-on: ${{ matrix.runs-on }}
Expand Down
16 changes: 8 additions & 8 deletions scripts/fetch-configlet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ get_download_url() {
local latest='https://api.github.com/repos/exercism/configlet/releases/latest'
local arch
case "$(uname -m)" in
*64*) arch='64bit' ;;
*686*) arch='32bit' ;;
*386*) arch='32bit' ;;
*) arch='64bit' ;;
x86_64) arch='x86-64' ;;
*686*) arch='i386' ;;
*386*) arch='i386' ;;
*) arch='x86-64' ;;
esac
local suffix="${os}-${arch}.${ext}"
local suffix="${os}_${arch}.${ext}"
curl "${curlopts[@]}" --header 'Accept: application/vnd.github.v3+json' "${latest}" |
grep "\"browser_download_url\": \".*/download/.*/configlet.*${suffix}\"$" |
cut -d'"' -f4
Expand All @@ -48,7 +48,7 @@ main() {

local os
case "$(uname)" in
Darwin*) os='mac' ;;
Darwin*) os='macos' ;;
Linux*) os='linux' ;;
Windows*) os='windows' ;;
MINGW*) os='windows' ;;
Expand All @@ -58,8 +58,8 @@ main() {

local ext
case "${os}" in
windows*) ext='zip' ;;
*) ext='tgz' ;;
windows*) ext='zip' ;;
*) ext='tar.gz' ;;
esac

echo "Fetching configlet..." >&2
Expand Down
4 changes: 2 additions & 2 deletions scripts/fetch-configlet.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ $requestOpts = @{
RetryIntervalSec = 1
}

$arch = If ([Environment]::Is64BitOperatingSystem) { "64bit" } Else { "32bit" }
$fileName = "configlet-windows-$arch.zip"
$arch = If ([Environment]::Is64BitOperatingSystem) { "x86-64" } Else { "i386" }
$fileName = "configlet_.+_windows_$arch.zip"

Function Get-DownloadUrl {
$latestUrl = "https://api.github.com/repos/exercism/configlet/releases/latest"
Expand Down