diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000000000..f31872f213144 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,48 @@ +name: Tests + +on: + pull_request: + push: + workflow_dispatch: + +jobs: + test_powershell: + name: WindowsPowerShell + runs-on: windows-latest + steps: + - name: Checkout Bucket + uses: actions/checkout@v2 + with: + fetch-depth: 2 + path: 'my_bucket' + - name: Checkout Scoop + uses: actions/checkout@v2 + with: + repository: ScoopInstaller/Scoop + path: 'scoop_core' + - name: Init and Test + shell: powershell + run: | + $env:SCOOP_HOME="$(Resolve-Path '.\scoop_core')" + .\scoop_core\test\bin\init.ps1 + .\my_bucket\bin\test.ps1 + test_pwsh: + name: PowerShell + runs-on: windows-latest + steps: + - name: Checkout Bucket + uses: actions/checkout@v2 + with: + fetch-depth: 2 + path: 'my_bucket' + - name: Checkout Scoop + uses: actions/checkout@v2 + with: + repository: ScoopInstaller/Scoop + path: 'scoop_core' + - name: Init and Test + shell: pwsh + run: | + $env:SCOOP_HOME="$(Resolve-Path '.\scoop_core')" + .\scoop_core\test\bin\init.ps1 + .\my_bucket\bin\test.ps1 diff --git a/README.md b/README.md index 598b42954b742..e3bae563be6d4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Scoop Main [![Build Status](https://ci.appveyor.com/api/projects/status/3i3h4mv47pnda41y?svg=true)](https://ci.appveyor.com/project/r15ch13/scoopinstaller-main "Build Status") [![Excavator](https://github.com/ScoopInstaller/Main/actions/workflows/excavator.yml/badge.svg)](https://github.com/ScoopInstaller/Main/actions/workflows/excavator.yml) +# Scoop Main [![Tests](https://github.com/ScoopInstaller/Main/actions/workflows/ci.yml/badge.svg)](https://github.com/ScoopInstaller/Main/actions/workflows/ci.yml) [![Excavator](https://github.com/ScoopInstaller/Main/actions/workflows/excavator.yml/badge.svg)](https://github.com/ScoopInstaller/Main/actions/workflows/excavator.yml) Core manifests for [Scoop](https://scoop.sh), the Windows command-line installer. For manifests that fit the [Main criteria](https://github.com/ScoopInstaller/Scoop/wiki/Criteria-for-including-apps-in-the-main-bucket). diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 69efdaf7030f2..0000000000000 --- a/appveyor.yml +++ /dev/null @@ -1,39 +0,0 @@ -version: "{build}-{branch}" -branches: - except: - - gh-pages -build: off -deploy: off -clone_depth: 2 -image: Visual Studio 2019 -environment: - scoop: C:\projects\scoop - scoop_home: C:\projects\scoop - scoop_helpers: C:\projects\helpers - lessmsi: '%scoop_helpers%\lessmsi\lessmsi.exe' - innounp: '%scoop_helpers%\innounp\innounp.exe' - matrix: - - PowerShell: 5 - - PowerShell: Current -cache: - - '%USERPROFILE%\Documents\WindowsPowerShell\Modules -> appveyor.yml' - - C:\projects\helpers -> appveyor.yml, test\bin\*.ps1 -matrix: - fast_finish: true -init: - - ps: if(!(Test-Path "$env:SCOOP")) { git clone -q --depth=1 "https://github.com/ScoopInstaller/Scoop" "$env:SCOOP" } -for: - - matrix: - only: - - PowerShell: 5 - install: - - ps: . "$env:SCOOP_HOME\test\bin\init.ps1" - test_script: - - ps: . "$env:SCOOP_HOME\test\bin\test.ps1" -TestPath "$env:APPVEYOR_BUILD_FOLDER" - - matrix: - only: - - PowerShell: Current - install: - - pwsh: . "$env:SCOOP_HOME\test\bin\init.ps1" - test_script: - - pwsh: . "$env:SCOOP_HOME\test\bin\test.ps1" -TestPath "$env:APPVEYOR_BUILD_FOLDER" diff --git a/bin/test.ps1 b/bin/test.ps1 index fc150a557e56c..6a741d9bad049 100644 --- a/bin/test.ps1 +++ b/bin/test.ps1 @@ -1,4 +1,5 @@ -#requires -Modules @{ ModuleName = 'Pester'; ModuleVersion = '4.4.0' } +#Requires -Modules @{ ModuleName = 'Pester'; MaximumVersion = '4.99' } if(!$env:SCOOP_HOME) { $env:SCOOP_HOME = Resolve-Path (scoop prefix scoop) } -Invoke-Pester "$psscriptroot/.." +$result = Invoke-Pester "$psscriptroot/.." -PassThru +exit $result.FailedCount