diff --git a/.github/workflows/admu-ci.yml b/.github/workflows/admu-ci.yml index d73711bb..88eadb42 100644 --- a/.github/workflows/admu-ci.yml +++ b/.github/workflows/admu-ci.yml @@ -18,33 +18,12 @@ jobs: needs: ["Filter-Branch"] runs-on: ubuntu-latest outputs: - RELEASE_TYPE: ${{ steps.validate.outputs.RELEASE_TYPE }} + RELEASE_TYPE: patch steps: - name: Validate-PR-Version-Labels id: validate - shell: pwsh run: | - $PR_LABEL_LIST=$(curl -s "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/labels" | jq -r '.[].name') - if ("ADMU" -in $PR_LABEL_LIST) { - write-host "Starting Build for PowerShell Module Release" - } - # validate type from label list: - $types = @('major', 'minor', 'patch', 'manual') - $typeCount = 0 - foreach ($item in $PR_LABEL_LIST) { - if ($item -in $types) { - write-host "$item" - $typeCount += 1 - $RELEASE_TYPE = $item - } - } - - if ($typeCount -eq 1) { - echo "RELEASE_TYPE=$RELEASE_TYPE" >> $env:GITHUB_OUTPUT - } else { - throw "Multiple or invalid release types were found on PR" - exit 1 - } + echo "skipped" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} Validate-Env-Variables: @@ -121,16 +100,22 @@ jobs: RELEASE_TYPE: ${{ needs.Check-PR-Labels.outputs.RELEASE_TYPE }} run: | . "${{ github.workspace }}/Deploy/build.ps1" -ModuleVersionType $env:RELEASE_TYPE -ModuleName "JumpCloud.ADMU" + - name: Prepare Upload + shell: powershell + run: | + $destinationFolder = "${{ github.workspace }}/Jumpcloud-ADMU/Combined" + New-Item -ItemType Directory -Path $destinationFolder -Force + + Copy-Item -Path "${{ github.workspace }}/Jumpcloud-ADMU/JumpCloud.ADMU.nuspec" -Destination $destinationFolder -Force + Copy-Item -Path "${{ github.workspace }}/Jumpcloud-ADMU/Docs/*.md" -Destination $destinationFolder -Force + Copy-Item -Path "${{ github.workspace }}/Jumpcloud-ADMU/Exe/*.exe" -Destination $destinationFolder -Force + Copy-Item -Path "${{ github.workspace }}/Jumpcloud-ADMU/Powershell/Form.ps1" -Destination $destinationFolder -Force + Copy-Item -Path "${{ github.workspace }}/Jumpcloud-ADMU/JumpCloud.ADMU.psd1" -Destination $destinationFolder -Force - name: Upload Nuspec - uses: actions/upload-artifact@v3 + uses: PaloAltoNetworks/upload-secure-artifact@b0e2f8dc09b06aa38239ad1b9e5b5b57b4732abc with: name: jumpcloud-admu-build - path: | - ${{ github.workspace }}/Jumpcloud-ADMU/JumpCloud.ADMU.nuspec - ${{ github.workspace }}/Jumpcloud-ADMU/Docs/*.md - ${{ github.workspace }}/Jumpcloud-ADMU/Exe/*.exe - ${{ github.workspace }}/Jumpcloud-ADMU/Powershell/Form.ps1 - ${{ github.workspace }}/Jumpcloud-ADMU/JumpCloud.ADMU.psd1 + path: ${{ github.workspace }}/Jumpcloud-ADMU/Combined retention-days: 1 Test-Module: needs: ["Setup-Build-Dependancies", "Check-PR-Labels", "Build-Module"] diff --git a/.github/workflows/admu-release.yml b/.github/workflows/admu-release.yml index 55153bf4..db8d3639 100644 --- a/.github/workflows/admu-release.yml +++ b/.github/workflows/admu-release.yml @@ -29,29 +29,8 @@ jobs: steps: - name: Validate-PR-Version-Labels id: validate - shell: pwsh run: | - $PR_LABEL_LIST=$(curl -s "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/labels" | jq -r '.[].name') - if ("ADMU" -in $PR_LABEL_LIST) { - write-host "Starting Build for ADMU Module Release" - } - # validate type from label list: - $types = @('major', 'minor', 'patch', 'manual') - $typeCount = 0 - foreach ($item in $PR_LABEL_LIST) { - if ($item -in $types) { - write-host "$item" - $typeCount += 1 - $RELEASE_TYPE = $item - } - } - - if ($typeCount -eq 1) { - echo "RELEASE_TYPE=$RELEASE_TYPE" >> $env:GITHUB_OUTPUT - } else { - throw "Multiple or invalid release types were found on PR" - exit 1 - } + echo "skipped" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} Setup-Build-Dependancies: @@ -169,7 +148,7 @@ jobs: region: ${{ secrets.AWS_REGION }} version: ${{ env.RELEASE_VERSION }} - name: Upload Release Artifacts - uses: actions/upload-artifact@v3 + uses: PaloAltoNetworks/upload-secure-artifact@b0e2f8dc09b06aa38239ad1b9e5b5b57b4732abc with: name: jumpcloud-admu path: | diff --git a/ModuleChangelog.md b/ModuleChangelog.md index c4197d9d..b8c0a8ec 100644 --- a/ModuleChangelog.md +++ b/ModuleChangelog.md @@ -1,3 +1,15 @@ +## 2.7.5 + +Release Date: August 20, 2024 + +#### RELEASE NOTES + +#### Bug Fixes: + +``` +* Testing - DO NOT MERGE +``` + ## 2.7.4 Release Date: August 14, 2024 diff --git a/jumpcloud-ADMU/JumpCloud.ADMU.psd1 b/jumpcloud-ADMU/JumpCloud.ADMU.psd1 index 0f599922..9b0eb181 100644 --- a/jumpcloud-ADMU/JumpCloud.ADMU.psd1 +++ b/jumpcloud-ADMU/JumpCloud.ADMU.psd1 @@ -13,7 +13,7 @@ # Version number of this module. - ModuleVersion = '2.7.4' + ModuleVersion = '2.7.5' # Supported PSEditions # CompatiblePSEditions = @() diff --git a/jumpcloud-ADMU/Powershell/Form.ps1 b/jumpcloud-ADMU/Powershell/Form.ps1 index c8d33139..0b7c289c 100644 --- a/jumpcloud-ADMU/Powershell/Form.ps1 +++ b/jumpcloud-ADMU/Powershell/Form.ps1 @@ -153,7 +153,7 @@ function show-mtpSelection { diff --git a/jumpcloud-ADMU/Powershell/ProgressForm.ps1 b/jumpcloud-ADMU/Powershell/ProgressForm.ps1 index fc391f89..7674ce86 100644 --- a/jumpcloud-ADMU/Powershell/ProgressForm.ps1 +++ b/jumpcloud-ADMU/Powershell/ProgressForm.ps1 @@ -37,7 +37,7 @@ function New-ProgressForm { diff --git a/jumpcloud-ADMU/Powershell/Start-Migration.ps1 b/jumpcloud-ADMU/Powershell/Start-Migration.ps1 index c8f4bff7..d94aa9f3 100644 --- a/jumpcloud-ADMU/Powershell/Start-Migration.ps1 +++ b/jumpcloud-ADMU/Powershell/Start-Migration.ps1 @@ -1883,7 +1883,7 @@ Function Start-Migration { $AGENT_INSTALLER_URL = "https://cdn02.jumpcloud.com/production/jcagent-msi-signed.msi" $AGENT_INSTALLER_PATH = "$windowsDrive\windows\Temp\JCADMU\jcagent-msi-signed.msi" $AGENT_CONF_PATH = "$($AGENT_PATH)\Plugins\Contrib\jcagent.conf" - $admuVersion = '2.7.4' + $admuVersion = '2.7.5' $script:AdminDebug = $AdminDebug $isForm = $PSCmdlet.ParameterSetName -eq "form"