diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2d5d9dee..186ca4d1 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -2,13 +2,15 @@ name: Release WinUtil on: workflow_run: - workflows: ["Compile WinUtil"] #Ensure Compile winget.ps1 is done + workflows: ["Compile"] #Ensure Compile winget.ps1 is done types: - completed jobs: build-runspace: runs-on: windows-latest + outputs: + version: ${{ steps.extract_version.outputs.version }} steps: - name: Checkout Repository uses: actions/checkout@v4 @@ -21,6 +23,7 @@ jobs: if ($_ -match 'Version\s*:\s*(\d{2}\.\d{2}\.\d{2})') { $version = $matches[1] echo "version=$version" >> $GITHUB_ENV + echo "::set-output name=version::$version" break } } @@ -28,7 +31,7 @@ jobs: Write-Error "Version not found in winutil.ps1" exit 1 } - shell: pwsh + shell: pwsh - name: Create and Upload Release id: create_release @@ -36,7 +39,6 @@ jobs: with: tag_name: ${{ steps.extract_version.outputs.version }} name: Release ${{ steps.extract_version.outputs.version }} - body_path: path/to/release-notes.md files: ./winutil.ps1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index ae90b7d7..0716fdcd 100644 --- a/README.md +++ b/README.md @@ -32,9 +32,9 @@ or by executing: iwr -useb https://christitus.com/win | iex ``` -if for some reason this site is not reachable from your country please try running it directly from github (replace 24.06.07 with current release that you are interested in) +if for some reason this site is not reachable from your country please try running it directly from github (replace `RELEASE_TAG` with current release that you are interested in, for example `v2024.06.05`) ``` -irm "https://raw.githubusercontent.com/ChrisTitusTech/winutil/24.06.07/winutil.ps1" | iex +irm "https://github.com/ChrisTitusTech/winutil/releases/download/RELEASE_TAG/winutil.ps1" | iex ``` #### Automation @@ -127,7 +127,7 @@ If you encounter any challenges or problems with the script, I kindly request th ## Contribute Code -If you adding, changing, or deleting an Application... submit to **APPLICATIONS branch**. We batch these in at the end of the month. +Pull Requests are now handled directly on the MAIN branch. This was done since we can now select specific releases to launch via releases in GitHub. If doing a code change and you can submit a PR to main branch, but I am very selective about these. Do not use a code formatter, massive amounts of line changes, and make multiple feature changes. EACH FEATURE CHANGE SHOULD BE IT'S OWN Pull Request! diff --git a/winutil.ps1 b/winutil.ps1 index 25c0d5bb..40b79198 100644 --- a/winutil.ps1 +++ b/winutil.ps1 @@ -8,7 +8,7 @@ Author : Chris Titus @christitustech Runspace Author: @DeveloperDurp GitHub : https://github.com/ChrisTitusTech - Version : 24.06.10 + Version : 24.06.11 #> param ( [switch]$Debug, @@ -45,7 +45,7 @@ Add-Type -AssemblyName System.Windows.Forms # Variable to sync between runspaces $sync = [Hashtable]::Synchronized(@{}) $sync.PSScriptRoot = $PSScriptRoot -$sync.version = "24.06.10" +$sync.version = "24.06.11" $sync.configs = @{} $sync.ProcessRunning = $false