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

fix(tcsh): print ANSI newline #5929

Merged
merged 11 commits into from
Nov 25, 2024
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
90 changes: 0 additions & 90 deletions .github/workflows/inno.yml

This file was deleted.

12 changes: 6 additions & 6 deletions .github/workflows/microsoft_store.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,24 @@ jobs:
product-update: '{
"packages":[
{
"packageUrl":"https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v${{ github.event.inputs.version }}/install-amd64.exe",
"packageUrl":"https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v${{ github.event.inputs.version }}/install-x64.msi",
"languages":["en"],
"architectures":["X64"],
"installerParameters":"/VERYSILENT /CURRENTUSER /INSTALLER=ws",
"installerParameters":"/quiet INSTALLER=ws",
"isSilentInstall":false
},
{
"packageUrl":"https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v${{ github.event.inputs.version }}/install-arm64.exe",
"packageUrl":"https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v${{ github.event.inputs.version }}/install-arm64.msi",
"languages":["en"],
"architectures":["Arm64"],
"installerParameters":"/VERYSILENT /CURRENTUSER /INSTALLER=ws",
"installerParameters":"/quiet INSTALLER=ws",
"isSilentInstall":false
},
{
"packageUrl":"https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v${{ github.event.inputs.version }}/install-386.exe",
"packageUrl":"https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v${{ github.event.inputs.version }}/install-x86.msi",
"languages":["en"],
"architectures":["X86"],
"installerParameters":"/VERYSILENT /CURRENTUSER /INSTALLER=ws",
"installerParameters":"/quiet INSTALLER=ws",
"isSilentInstall":false
}
]
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/msi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,22 @@ jobs:
data: await fs.readFile(`./packages/msi/out/${file}`)
});
}
notify:
runs-on: ubuntu-latest
needs: package
strategy:
matrix:
workflow: [winget, microsoft_store, scoop]
steps:
- name: Notify 🙋🏾‍♀️
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea
with:
github-token: ${{ secrets.GH_PAT }}
script: |
await github.request('POST /repos/{owner}/{repo}/actions/workflows/{workflow_id}/dispatches', {
owner: 'jandedobbeleer',
repo: '${{ github.event.repository.name }}',
workflow_id: '${{ matrix.workflow }}.yml',
ref: 'main',
inputs: {"version": process.env.GITHUB_REF.replace('refs/tags/v', ''), "release": "${{ github.event.release.id }}" }
})
50 changes: 0 additions & 50 deletions packages/inno/build.ps1

This file was deleted.

48 changes: 0 additions & 48 deletions packages/inno/oh-my-posh.iss

This file was deleted.

1 change: 0 additions & 1 deletion packages/msi/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ This guide assumes and advices the use of PowerShell as your shell environment f

```powershell
$env:VERSION = "1.3.37"
$env:INSTALLER= "msi"
```

### Build the installer
Expand Down
6 changes: 3 additions & 3 deletions packages/scoop/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ function Get-HashForArchitecture {
[string]
$Version
)
$hash = (new-object Net.WebClient).DownloadString("https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v$Version/install-$Architecture.exe.sha256")
$hash = (new-object Net.WebClient).DownloadString("https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v$Version/install-$Architecture.msi.sha256")
return $hash.Trim()
}

New-Item -Path "." -Name "dist" -ItemType "directory"

$HashAmd64 = Get-HashForArchitecture -Architecture 'amd64' -Version $Version
$Hash386 = Get-HashForArchitecture -Architecture '386' -Version $Version
$HashAmd64 = Get-HashForArchitecture -Architecture 'x64' -Version $Version
$Hash386 = Get-HashForArchitecture -Architecture 'x86' -Version $Version

$content = Get-Content '.\oh-my-posh.json' -Raw
$content = $content.Replace('<VERSION>', $Version)
Expand Down
27 changes: 5 additions & 22 deletions packages/scoop/oh-my-posh.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,39 +8,22 @@
},
"architecture": {
"64bit": {
"url": "https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v<VERSION>/install-amd64.exe",
"url": "https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v<VERSION>/install-x64.msi",
"hash": "<HASH-AMD64>"
},
"32bit": {
"url": "https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v<VERSION>/install-386.exe",
"url": "https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v<VERSION>/install-x86.msi",
"hash": "<HASH-386>"
}
},
"installer": {
"args": [
"/CURRENTUSER",
"/VERYSILENT",
"/INSTALLER=scoop"
"/quiet",
"INSTALLER=scoop"
]
},
"checkver": {
"github": "https://github.com/JanDeDobbeleer/oh-my-posh"
},
"post_install": [
"Write-Host 'Thanks for installing Oh My Posh.'",
"Write-Host 'Have a look at https://ohmyposh.dev for detailed instructions for your shell.'"
],
"autoupdate": {
"architecture": {
"64bit": {
"url": "https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v<VERSION>/install-amd64.exe"
},
"32bit": {
"url": "https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v<VERSION>/install-386.exe"
}
},
"hash": {
"url": "$url.sha256"
}
}
]
}
32 changes: 19 additions & 13 deletions packages/winget/JanDeDobbeleer.OhMyPosh.installer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,53 @@ ReleaseDate: <DATE>
Platform:
- Windows.Desktop
MinimumOSVersion: 10.0.0.0
InstallerType: inno
InstallerType: msi
InstallModes:
- interactive
- silent
- silentWithProgress
Installers:
- Architecture: x64
InstallerUrl: https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v<VERSION>/install-amd64.exe
InstallerUrl: https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v<VERSION>/install-x64.msi
InstallerSha256: <HASH-AMD64>
Scope: machine
UpgradeBehavior: install
InstallerSwitches:
Custom: /INSTALLER=winget /ALLUSERS
Custom: INSTALLER=winget ALLUSERS=1
- Architecture: x64
InstallerUrl: https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v<VERSION>/install-amd64.exe
InstallerUrl: https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v<VERSION>/install-x64.msi
InstallerSha256: <HASH-AMD64>
Scope: user
UpgradeBehavior: install
InstallerSwitches:
Custom: /INSTALLER=winget /CURRENTUSER
Custom: INSTALLER=winget
- Architecture: x86
InstallerUrl: https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v<VERSION>/install-386.exe
InstallerUrl: https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v<VERSION>/install-x86.msi
InstallerSha256: <HASH-386>
Scope: machine
UpgradeBehavior: install
InstallerSwitches:
Custom: /INSTALLER=winget /ALLUSERS
Custom: INSTALLER=winget ALLUSERS=1
- Architecture: x86
InstallerUrl: https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v<VERSION>/install-386.exe
InstallerUrl: https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v<VERSION>/install-x86.msi
InstallerSha256: <HASH-386>
Scope: user
UpgradeBehavior: install
InstallerSwitches:
Custom: /INSTALLER=winget /CURRENTUSER
Custom: INSTALLER=winget
- Architecture: arm64
InstallerUrl: https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v<VERSION>/install-arm64.exe
InstallerUrl: https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v<VERSION>/install-arm64.msi
InstallerSha256: <HASH-ARM64>
Scope: machine
UpgradeBehavior: install
InstallerSwitches:
Custom: /INSTALLER=winget /ALLUSERS
Custom: INSTALLER=winget ALLUSERS=1
- Architecture: arm64
InstallerUrl: https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v<VERSION>/install-arm64.exe
InstallerUrl: https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v<VERSION>/install-arm64.msi
InstallerSha256: <HASH-ARM64>
Scope: user
UpgradeBehavior: install
InstallerSwitches:
Custom: /INSTALLER=winget /CURRENTUSER
Custom: INSTALLER=winget
ManifestType: installer
ManifestVersion: 1.6.0
Loading