Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion .github/workflows/release-cfl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ permissions:

jobs:
release:
uses: open-cli-collective/.github/.github/workflows/release.yml@v1
uses: open-cli-collective/.github/.github/workflows/release.yml@6ee65fbc893f13b8876f013ec0661219a3e18269
with:
working-directory: tools/cfl
# tag push is live (false); workflow_dispatch honors the checkbox. Compare
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-jtk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ permissions:

jobs:
release:
uses: open-cli-collective/.github/.github/workflows/release.yml@v1
uses: open-cli-collective/.github/.github/workflows/release.yml@6ee65fbc893f13b8876f013ec0661219a3e18269
with:
working-directory: tools/jtk
# tag push is live (false); workflow_dispatch honors the checkbox. Compare
Expand Down
38 changes: 38 additions & 0 deletions .github/workflows/test-winget.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Test Winget Manifests

on:
pull_request:
paths:
- 'tools/*/packaging/winget/**'
- '.github/workflows/test-winget.yml'
push:
branches: [main]
paths:
Expand All @@ -12,6 +16,23 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install current WinGet validator
shell: pwsh
run: |
$bundle = Join-Path $env:RUNNER_TEMP "Microsoft.DesktopAppInstaller.msixbundle"
Invoke-WebRequest "https://github.com/microsoft/winget-cli/releases/download/v1.29.380/Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle" -OutFile $bundle
$expected = "65dea9c01ce08ee7b763366b27c0e651f97db857c11ca9b9c301826c10092f2e"
if ((Get-FileHash $bundle -Algorithm SHA256).Hash -ne $expected) { throw "WinGet bundle checksum mismatch" }
$deps = Join-Path $env:RUNNER_TEMP "winget-dependencies.zip"
Invoke-WebRequest "https://github.com/microsoft/winget-cli/releases/download/v1.29.380/DesktopAppInstaller_Dependencies.zip" -OutFile $deps
$depsHash = "ba875afe9d190f61218985ac0292a99d1db710bf93e13c68944ca9d89f0d82d1"
if ((Get-FileHash $deps -Algorithm SHA256).Hash -ne $depsHash) { throw "WinGet dependencies checksum mismatch" }
$depsDir = Join-Path $env:RUNNER_TEMP "winget-dependencies"
Expand-Archive -Path $deps -DestinationPath $depsDir
$dependencyPaths = @(Get-ChildItem (Join-Path $depsDir "x64") -Filter "*.appx" | ForEach-Object FullName)
Add-AppxPackage -Path $bundle -DependencyPath $dependencyPaths
winget --version

- name: Validate manifest schema
shell: pwsh
run: |
Expand Down Expand Up @@ -53,6 +74,23 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install current WinGet validator
shell: pwsh
run: |
$bundle = Join-Path $env:RUNNER_TEMP "Microsoft.DesktopAppInstaller.msixbundle"
Invoke-WebRequest "https://github.com/microsoft/winget-cli/releases/download/v1.29.380/Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle" -OutFile $bundle
$expected = "65dea9c01ce08ee7b763366b27c0e651f97db857c11ca9b9c301826c10092f2e"
if ((Get-FileHash $bundle -Algorithm SHA256).Hash -ne $expected) { throw "WinGet bundle checksum mismatch" }
$deps = Join-Path $env:RUNNER_TEMP "winget-dependencies.zip"
Invoke-WebRequest "https://github.com/microsoft/winget-cli/releases/download/v1.29.380/DesktopAppInstaller_Dependencies.zip" -OutFile $deps
$depsHash = "ba875afe9d190f61218985ac0292a99d1db710bf93e13c68944ca9d89f0d82d1"
if ((Get-FileHash $deps -Algorithm SHA256).Hash -ne $depsHash) { throw "WinGet dependencies checksum mismatch" }
$depsDir = Join-Path $env:RUNNER_TEMP "winget-dependencies"
Expand-Archive -Path $deps -DestinationPath $depsDir
$dependencyPaths = @(Get-ChildItem (Join-Path $depsDir "x64") -Filter "*.appx" | ForEach-Object FullName)
Add-AppxPackage -Path $bundle -DependencyPath $dependencyPaths
winget --version

- name: Validate manifest schema
shell: pwsh
run: |
Expand Down
29 changes: 14 additions & 15 deletions .github/workflows/winget-publish-cfl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,22 @@ on:
required: true
type: string

permissions:
contents: read

jobs:
publish:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4

- name: Install wingetcreate
run: |
iwr https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe

- name: Update manifest
env:
WINGET_CREATE_GITHUB_TOKEN: ${{ secrets.WINGET_GITHUB_TOKEN }}
run: |
$version = "${{ inputs.version }}"
$baseUrl = "https://github.com/open-cli-collective/atlassian-cli/releases/download/cfl-v$version"
./wingetcreate.exe update OpenCLICollective.cfl `
--version $version `
--urls "$baseUrl/cfl_${version}_windows_amd64.zip|x64" "$baseUrl/cfl_${version}_windows_arm64.zip|arm64" `
--submit
- name: Submit WinGet package
uses: open-cli-collective/.github/actions/winget-submit@6ee65fbc893f13b8876f013ec0661219a3e18269
with:
package-id: OpenCLICollective.cfl
version: ${{ inputs.version }}
final-tag: cfl-v${{ inputs.version }}
repo: ${{ github.repository }}
working-directory: tools/cfl
bootstrap: "false"
github-token: ${{ github.token }}
winget-token: ${{ secrets.WINGET_GITHUB_TOKEN }}
29 changes: 14 additions & 15 deletions .github/workflows/winget-publish-jtk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,22 @@ on:
required: true
type: string

permissions:
contents: read

jobs:
publish:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4

- name: Install wingetcreate
run: |
iwr https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe

- name: Update manifest
env:
WINGET_CREATE_GITHUB_TOKEN: ${{ secrets.WINGET_GITHUB_TOKEN }}
run: |
$version = "${{ inputs.version }}"
$baseUrl = "https://github.com/open-cli-collective/atlassian-cli/releases/download/jtk-v$version"
./wingetcreate.exe update OpenCLICollective.jira-ticket-cli `
--version $version `
--urls "$baseUrl/jtk_${version}_windows_amd64.zip|x64" "$baseUrl/jtk_${version}_windows_arm64.zip|arm64" `
--submit
- name: Submit WinGet package
uses: open-cli-collective/.github/actions/winget-submit@6ee65fbc893f13b8876f013ec0661219a3e18269
with:
package-id: OpenCLICollective.jira-ticket-cli
version: ${{ inputs.version }}
final-tag: jtk-v${{ inputs.version }}
repo: ${{ github.repository }}
working-directory: tools/jtk
bootstrap: "false"
github-token: ${{ github.token }}
winget-token: ${{ secrets.WINGET_GITHUB_TOKEN }}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.10.0.schema.json
# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.28.0.schema.json

PackageIdentifier: OpenCLICollective.cfl
PackageVersion: 0.0.0
Expand All @@ -15,4 +15,4 @@ Installers:
InstallerUrl: https://github.com/open-cli-collective/atlassian-cli/releases/download/cfl-v0.0.0/cfl_0.0.0_windows_arm64.zip
InstallerSha256: 0000000000000000000000000000000000000000000000000000000000000000
ManifestType: installer
ManifestVersion: 1.10.0
ManifestVersion: 1.28.0
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultLocale.1.10.0.schema.json
# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultLocale.1.28.0.schema.json

PackageIdentifier: OpenCLICollective.cfl
PackageVersion: 0.0.0
Expand All @@ -24,4 +24,4 @@ Tags:
- documentation
ReleaseNotesUrl: https://github.com/open-cli-collective/atlassian-cli/releases
ManifestType: defaultLocale
ManifestVersion: 1.10.0
ManifestVersion: 1.28.0
4 changes: 2 additions & 2 deletions tools/cfl/packaging/winget/OpenCLICollective.cfl.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.10.0.schema.json
# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.28.0.schema.json

PackageIdentifier: OpenCLICollective.cfl
PackageVersion: 0.0.0
DefaultLocale: en-US
ManifestType: version
ManifestVersion: 1.10.0
ManifestVersion: 1.28.0
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.10.0.schema.json
# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.28.0.schema.json

PackageIdentifier: OpenCLICollective.jira-ticket-cli
PackageVersion: 0.0.0
Expand All @@ -15,4 +15,4 @@ Installers:
InstallerUrl: https://github.com/open-cli-collective/atlassian-cli/releases/download/jtk-v0.0.0/jtk_0.0.0_windows_arm64.zip
InstallerSha256: CHECKSUM_ARM64_PLACEHOLDER
ManifestType: installer
ManifestVersion: 1.10.0
ManifestVersion: 1.28.0
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultLocale.1.10.0.schema.json
# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultLocale.1.28.0.schema.json

PackageIdentifier: OpenCLICollective.jira-ticket-cli
PackageVersion: 0.0.0
Expand All @@ -23,4 +23,4 @@ Tags:
- agile
ReleaseNotesUrl: https://github.com/open-cli-collective/atlassian-cli/releases
ManifestType: defaultLocale
ManifestVersion: 1.10.0
ManifestVersion: 1.28.0
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.10.0.schema.json
# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.28.0.schema.json

PackageIdentifier: OpenCLICollective.jira-ticket-cli
PackageVersion: 0.0.0
DefaultLocale: en-US
ManifestType: version
ManifestVersion: 1.10.0
ManifestVersion: 1.28.0
Loading