Skip to content

Commit ab4c7c2

Browse files
authored
Merge pull request #1256 from rabbitmq/lukebakken/ci-updates
CI updates
2 parents cc47745 + 9873d86 commit ab4c7c2

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed
File renamed without changes.

tools/install.ps1 renamed to .ci/install.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Set-StrictMode -Version 2.0
44

55
[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor 'Tls12'
66

7-
$versions_path = Join-Path -Path $env:GITHUB_WORKSPACE -ChildPath 'tools' | Join-Path -ChildPath 'versions.json'
7+
$versions_path = Join-Path -Path $env:GITHUB_WORKSPACE -ChildPath '.ci' | Join-Path -ChildPath 'versions.json'
88
$versions = Get-Content $versions_path | ConvertFrom-Json
99
Write-Host "[INFO] versions: $versions"
1010
$erlang_ver = $versions.erlang

.ci/versions.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"erlang": "25.1.1",
3+
"rabbitmq": "3.11.1"
4+
}

.github/workflows/main.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
# Note: the cache path is relative to the workspace directory
2828
# https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#using-the-cache-action
2929
path: ~/installers
30-
key: ${{ runner.os }}-v0-${{ hashFiles('tools/versions.json') }}
30+
key: ${{ runner.os }}-v0-${{ hashFiles('.ci/versions.json') }}
3131
- name: Cache NuGet packages
3232
uses: actions/cache@v2
3333
with:
@@ -38,15 +38,15 @@ jobs:
3838
restore-keys: |
3939
${{ runner.os }}-v0-nuget-
4040
- name: Install and start RabbitMQ
41-
run: ./tools/install.ps1
41+
run: ./.ci/install.ps1
4242
- name: List NuGet sources
4343
run: dotnet nuget locals all --list
4444
- name: Restore
4545
run: dotnet restore --verbosity=normal
4646
- name: Build
4747
run: dotnet build --no-restore --verbosity=normal
4848
- name: Test
49-
run: ./tools/gha-run-tests.ps1
49+
run: ./.ci/gha-run-tests.ps1
5050

5151
build:
5252
name: build/test on ubuntu-latest

tools/versions.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)