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.

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

chore(ci): remove i386, optimize latest build and add various comments #1010

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
5 changes: 5 additions & 0 deletions .github/config/goreleaser.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# goreleaser.yaml (this config) is responsible for our official releases.
# However, latest builds (equivalent to nightlies based on the main branch), uses latest.yml
version: 2

before:
Expand Down Expand Up @@ -33,6 +35,9 @@ builds:
id: windows
goos:
- windows
goarch:
- amd64
- arm64

archives:
- name_template: "{{ .Binary }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}"
Expand Down
11 changes: 5 additions & 6 deletions .github/config/latest.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
# .goreleaser.yml

# this file only takes care of the latest builds (equivalent to nightlies based on the main branch),
# for the official (real) release, check goreleaser.yaml
version: 2

before:
hooks:
- go mod tidy

builds:
- <<: &build_defaults
binary: ocm
Expand Down Expand Up @@ -34,6 +30,9 @@ builds:
id: windows
goos:
- windows
goarch:
- amd64
- arm64

archives:
- name_template: "{{ .Binary }}-latest-{{ .Os }}-{{ .Arch }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
- '**/*.mod'
- '**/*.sum'
- 'resources/**'
- '.github/config/latest.yml'

jobs:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
name: Publish Release
# This publish step takes care of some (but not all ;) ) of the package registries
# that we think might be useful for people to consume.
#
# Other package registries might also be pushed in the goreleaser step (see publish-latest.yaml) and are configured
jakobmoellerdev marked this conversation as resolved.
Show resolved Hide resolved
# within .github/config/goreleaser.yaml.
#
# TODO: Unify
name: Publish Release to other package registries than Github

on:
workflow_dispatch:
Expand Down Expand Up @@ -118,7 +125,6 @@ jobs:
run: |
cd hack\winget
wingetcreate update --submit --token ${{ steps.generate_token.outputs.token }} --urls `
https://github.com/open-component-model/ocm/releases/download/v${{ env.RELEASE_VERSION }}/ocm-${{ env.RELEASE_VERSION }}-windows-386.zip `
https://github.com/open-component-model/ocm/releases/download/v${{ env.RELEASE_VERSION }}/ocm-${{ env.RELEASE_VERSION }}-windows-amd64.zip `
https://github.com/open-component-model/ocm/releases/download/v${{ env.RELEASE_VERSION }}/ocm-${{ env.RELEASE_VERSION }}-windows-arm64.zip `
--version ${{ env.RELEASE_VERSION }} `
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -296,11 +296,13 @@ jobs:
event-type: ocm-cli-release
client-payload: '{"tag": "${{ env.RELEASE_VERSION }}"}'

# now distribute the release event so that other jobs can listen for this
# and use the event to publish our release to other package registries
- name: Publish Release Event for other package registries
if: inputs.release_candidate == false
uses: peter-evans/repository-dispatch@v3
with:
token: ${{ steps.generate_token.outputs.token }}
repository: open-component-model/ocm
event-type: ocm-cli-release
client-payload: '{"version": "${{ env.RELEASE_VERSION }}"}'
client-payload: '{"version": "${{ env.RELEASE_VERSION }}"}'
4 changes: 0 additions & 4 deletions hack/chocolatey/tools/chocolateyinstall.ps1
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
$ErrorActionPreference = 'Stop'
$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
$url = "run: update.ps1"
$url64 = "run: update.ps1"

$packageArgs = @{
packageName = $env:ChocolateyPackageName
unzipLocation = $toolsDir
url = $url
url64bit = $url64
softwareName = 'ocm-cli*'

checksum = 'run: update.ps1'
checksumType = 'sha256'
checksum64 = 'run: update.ps1'
checksumType64= 'sha256'
}
Expand Down
10 changes: 2 additions & 8 deletions hack/chocolatey/update.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,8 @@ $response = Invoke-RestMethod -Uri $url -Headers @{ "User-Agent" = "PowerShell"
$latestVersion = $response.tag_name -replace '^v', ''
Write-Output "The latest released ocm-cli version is $latestVersion"
$assets = $response.assets
$url = $assets | Where-Object { $_.name -match 'windows-386.zip$' } | Select-Object -ExpandProperty browser_download_url
$url64 = $assets | Where-Object { $_.name -match 'windows-amd64.zip$' } | Select-Object -ExpandProperty browser_download_url
$sha256url = $assets | Where-Object { $_.name -match 'windows-386.zip.sha256$' } | Select-Object -ExpandProperty browser_download_url
$sha256url64 = $assets | Where-Object { $_.name -match 'windows-amd64.zip.sha256$' } | Select-Object -ExpandProperty browser_download_url
$sha256 = [System.Text.Encoding]::UTF8.GetString((Invoke-WebRequest -Uri $sha256url).Content)
$sha256_64 = [System.Text.Encoding]::UTF8.GetString((Invoke-WebRequest -Uri $sha256url64).Content)

# Update the description and release notes in the nuspec file
Expand Down Expand Up @@ -58,13 +55,10 @@ Write-Output "Updated the <authors> tag in the nuspec file with the sorted list
# Update the install script with the new URLs
$scriptPath = Join-Path -Path $PSScriptRoot -ChildPath "tools\chocolateyinstall.ps1"
$scriptContent = Get-Content -Path $scriptPath -Raw
$updatedContent = $scriptContent -replace '\$url\s*=\s*".*"', (-join('$url = "', $url, '"'))
$updatedContent = $updatedContent -replace '\$url64\s*=\s*".*"', (-join('$url64 = "', $url64, '"'))
$updatedContent = $updatedContent -replace "checksum\s*=\s*'.*'", "checksum = '$sha256'"
$updatedContent = $scriptContent -replace '\$url64\s*=\s*".*"', (-join('$url64 = "', $url64, '"'))
$updatedContent = $updatedContent -replace "checksum64\s*=\s*'.*'", "checksum64 = '$sha256_64'"
Set-Content -Path $scriptPath -Value $updatedContent
Write-Output "Using $url ($sha256)"
Write-Output "and $url64 ($sha256_64) as package sources."
Write-Output "Using $url64 ($sha256_64) as package sources."

# Copy the LICENSE file to the tools directory
$licenseDest = Join-Path -Path $PSScriptRoot -ChildPath "tools\LICENSE.txt"
Expand Down