Skip to content

Commit

Permalink
fixes #82 - updated gitlab cicd for gitlab17
Browse files Browse the repository at this point in the history
  • Loading branch information
techthoughts2 committed May 18, 2024
1 parent a6a97b7 commit bfad874
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 14 deletions.
5 changes: 4 additions & 1 deletion docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [2.10.0]
## [2.11.0]

- Catesta template module changes
- CI/CD Changes:
Expand All @@ -27,6 +27,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- AWS.Tools.Common bumped from `4.1.133` to `4.1.572`
- GitHub Actions:
- Workflow actions now include the module name in the action name
- GitLab CI/CD:
- Updated from `shared-windows` and `windows-1809` tagged shared runners to `saas-windows-medium-amd64` and `windows-2022` to support GitLab 17.
- pwsh is now pre-installed on the 2022 runner (albeit an older version) so the `choco` install for `pwsh` has been commented out. *Note: if you want the latest version of pwsh, uncomment the `choco` command*
- InvokeBuild bumped from `5.10.5` to `5.11.1`
- PSScriptAnalyzer bumped from `1.21.0` to `1.22.0`
- Catesta primary module changes
Expand Down
2 changes: 1 addition & 1 deletion docs/Catesta.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Module Name: Catesta
Module Guid: 6796b193-9013-468a-b022-837749af2d06
Download Help Link: NA
Help Version: 2.10.0
Help Version: 2.11.0
Locale: en-US
---

Expand Down
2 changes: 1 addition & 1 deletion src/Catesta/Catesta.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
RootModule = 'Catesta.psm1'

# Version number of this module.
ModuleVersion = '2.10.0'
ModuleVersion = '2.11.0'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down
18 changes: 9 additions & 9 deletions src/Catesta/Resources/GitLab/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@
# No code coverage report: https://github.com/pester/Pester/issues/2203
# No macOS support out of premium beta: https://docs.gitlab.com/ee/ci/runners/saas/macos_saas_runner.html

.shared_windows_runners:
.windows-2022:
tags:
- shared-windows
- windows
- windows-1809
- saas-windows-medium-amd64

stages:
<%
Expand Down Expand Up @@ -55,7 +53,7 @@ if ($PLASTER_PARAM_GitLabOptions -eq 'windows') {
# it can take up to 5 minutes to provision a shared windows machine on GitLab
windows_powershell_job:
extends:
- .shared_windows_runners
- .windows-2022
stage: windows_powershell
script:
- powershell -c "Get-Host"
Expand All @@ -79,15 +77,17 @@ if ($PLASTER_PARAM_GitLabOptions -eq 'pwshcore') {
# it can take up to 5 minutes to provision a shared windows machine on GitLab
windows_pwsh_job:
extends:
- .shared_windows_runners
- .windows-2022
stage: windows_pwsh
script:
- powershell -c "Get-Host"
- chocolatey install -y powershell-core
# The GitLab 2022 Windows shared runner image usually has an older version of PowerShell installed.
# uncomment the line below if you want to install the latest version of PowerShell
# - choco install -y powershell-core
- $env:Path = [System.Environment]::ExpandEnvironmentVariables([System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User"))
# uncomment the line below to explore what modules/variables/env variables are available in the build image
- pwsh -c "Get-Host"
- pwsh -c "Get-Module -ListAvailable; (Get-Variable).GetEnumerator() | Sort-Object Name | Out-String; (Get-ChildItem env:*).GetEnumerator() | Sort-Object Name | Out-String"
# uncomment the line below to explore what modules/variables/env variables are available in the build image
# - pwsh -c "Get-Module -ListAvailable; (Get-Variable).GetEnumerator() | Sort-Object Name | Out-String; (Get-ChildItem env:*).GetEnumerator() | Sort-Object Name | Out-String"
- pwsh -File .\actions_bootstrap.ps1
- pwsh -c "Invoke-Build -File .\src\<%=$PLASTER_PARAM_ModuleName%>.build.ps1"
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion src/Catesta/Resources/Module/plasterManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<metadata>
<name>Catesta</name>
<id>258a61ba-566b-4c3a-8230-c2b6861a1a8d</id>
<version>2.10.0</version>
<version>2.11.0</version>
<title>Catesta</title>
<description>Scaffolds a new PowerShell module project</description>
<author>Jake Morrison</author>
Expand Down
2 changes: 1 addition & 1 deletion src/Catesta/Resources/Vault/plasterManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<metadata>
<name>Catesta</name>
<id>d531e058-52b8-4dd2-8162-01c95d1eb8f7</id>
<version>2.10.0</version>
<version>2.11.0</version>
<title>Catesta</title>
<description>Scaffolds a new PowerShell SecretManagement extension vault module project</description>
<author>Jake Morrison</author>
Expand Down

0 comments on commit bfad874

Please sign in to comment.