saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix windows mac test matrix

Browse source
This commit is contained in:
Daniel A. Wozniak 2024-12-03 16:14:51 -07:00 • committed by Daniel Wozniak
parent 18f0901fcd
commit d3728d1ad6
3 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/staging.yml vendored
View file

@ -571,12 +571,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Get Salt Project GitHub Actions Bot Environment
run: |
TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30")
SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment)
echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV"
- name: Setup Python Tools Scripts
uses: ./.github/actions/setup-python-tools-scripts
with:

3
.github/workflows/templates/staging.yml.jinja vendored
View file

@ -91,12 +91,13 @@ concurrency:
- ubuntu-latest
steps:
- uses: actions/checkout@v4
{#-
- name: Get Salt Project GitHub Actions Bot Environment
run: |
TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30")
SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment)
echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV"
#}
- name: Setup Python Tools Scripts
uses: ./.github/actions/setup-python-tools-scripts

6
.github/workflows/test-action.yml vendored
View file

@ -68,7 +68,7 @@ jobs:
test-linux:
name: ${{ matrix.display_name }} ${{ matrix.tests-chunk }} ${{ matrix.transport }}
runs-on:
- ${{ matrix.arch == 'x86_64' && 'ubuntu-24.04' || 'linux-arm64' }}
- ${{ matrix.arch == 'x86_64' && 'ubuntu-22.04' || 'linux-arm64' }}
container:
image: ${{ matrix.container }}
# Full test runs. Each chunk should never take more than 2 hours.
@ -320,7 +320,7 @@ jobs:
strategy:
fail-fast: false
matrix:
include: ${{ fromJSON(inputs.matrix)['linux'] }}
include: ${{ fromJSON(inputs.matrix)['macos'] }}
env:
SALT_TRANSPORT: ${{ matrix.transport }}
@ -553,7 +553,7 @@ jobs:
strategy:
fail-fast: false
matrix:
include: ${{ fromJSON(inputs.matrix)['linux'] }}
include: ${{ fromJSON(inputs.matrix)['windows'] }}
env:
SALT_TRANSPORT: ${{ matrix.transport }}