Skip to content

Commit 82fd945

Browse files
adimoftadimoft
committed
Fixed some linter warnings
1 parent c52c1b7 commit 82fd945

14 files changed

+167
-154
lines changed

‎.github/workflows/check-circular-deps.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
3-
3+
---
44
name: Circular dependency check
55

66
on:
@@ -16,7 +16,7 @@ permissions: read-all
1616
jobs:
1717
spec-check:
1818
name: Circular dependency check
19-
runs-on: [ ubuntu-latest ]
19+
runs-on: ubuntu-latest
2020

2121
steps:
2222
# Checkout the branch of our repo that triggered this action
@@ -28,7 +28,7 @@ jobs:
2828
- name: Check for circular dependencies
2929
run: |
3030
echo "Checking for circular dependency loops..."
31-
# Call this script to sync the toolchain manifests with the LKG daily build.
31+
# This will sync the toolchain manifests with the LKG daily build.
3232
#./toolkit/scripts/setuplkgtoolchain.sh
3333
# Determine the LKG daily build ID.
3434
#LKG_BUILD_ID=$(wget -qO - https://mariner3dailydevrepo.blob.core.windows.net/lkg/lkg-3.0-dev.json | jq -r ".dailybuildid" | tr '\.' '-')

‎.github/workflows/check-entangled-specs.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# This action checks that certain groups of specs have matching tags.
55
# The main use case is to ensure that signed specs have the same Version and
66
# Release tags as their unsigned counterparts
7+
---
78
name: Spec Entanglement Mismatch Check
89

910
on:
@@ -22,8 +23,8 @@ jobs:
2223
uses: actions/checkout@v4
2324
with:
2425
persist-credentials: false
25-
26-
# For consistency, we use the same major/minor version of Python that Azure Linux ships
26+
27+
# We use the same major/minor version of Python that Azure Linux ships
2728
- name: Setup Python 3.12
2829
uses: actions/setup-python@v5
2930
with:

‎.github/workflows/check-license-map.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
# This action checks that the licenses.json file is up-to-date
55
# and that the LICENSES-MAP.md file is up-to-date
6+
---
67
name: Spec License Map Check
78

89
on:
@@ -18,15 +19,15 @@ permissions: read-all
1819
jobs:
1920
check:
2021
name: Spec License Map Check
21-
runs-on: [ ubuntu-latest ]
22+
runs-on: ubuntu-latest
2223

2324
steps:
2425
# Checkout the branch of our repo that triggered this action
2526
- name: Workflow trigger checkout
2627
uses: actions/checkout@v4
2728
with:
2829
persist-credentials: false
29-
30+
3031
- name: Setup Python 3.12
3132
uses: actions/setup-python@v5
3233
with:

‎.github/workflows/check-manifests.yml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
3-
3+
---
44
name: Check Manifests
55

66
on:
@@ -17,28 +17,28 @@ permissions: read-all
1717
jobs:
1818
build:
1919
name: Check Manifests
20-
runs-on: [ ubuntu-latest ]
20+
runs-on: ubuntu-latest
2121

2222
steps:
23-
- name: Check out code
24-
uses: actions/checkout@v4
25-
with:
23+
- name: Check out code
24+
uses: actions/checkout@v4
25+
with:
2626
persist-credentials: false
2727

28-
# This PR runner uses an older Ubuntu with rpm version 4.17, which doesn't understand some newer macros like %bcond
29-
- name: Define missing rpm macros
30-
run: |
31-
if [[ -n $(rpm --eval '%bcond test 1') ]]; then
32-
echo '%bcond() %[ (%{2}) ? "%{expand:%%bcond_without %{1}}" : "%{expand:%%bcond_with %{1}}" ]' > ~/.rpmmacros
33-
fi
28+
# This PR runner uses an older Ubuntu with rpm version 4.17, which doesn't understand some newer macros like %bcond
29+
- name: Define missing rpm macros
30+
run: |
31+
if [[ -n $(rpm --eval '%bcond test 1') ]]; then
32+
echo '%bcond() %[ (%{2}) ? "%{expand:%%bcond_without %{1}}" : "%{expand:%%bcond_with %{1}}" ]' > ~/.rpmmacros
33+
fi
3434
35-
- name: Check x86_64 manifests
36-
run: |
37-
echo ##########
38-
echo "Ensure toolchain and pkggen manifests (./toolkit/resources/manifests/package/*) match the versions in the .spec files"
39-
echo "Run './scripts/toolchain/check_manifests.sh -a \"x86_64\"' to validate locally"
40-
echo ##########
41-
pushd toolkit
42-
./scripts/toolchain/check_manifests.sh -a "x86_64"
43-
popd
44-
shell: bash
35+
- name: Check x86_64 manifests
36+
run: |
37+
echo ##########
38+
echo "Ensure toolchain and pkggen manifests (./toolkit/resources/manifests/package/*) match the versions in the .spec files"
39+
echo "Run './scripts/toolchain/check_manifests.sh -a \"x86_64\"' to validate locally"
40+
echo ##########
41+
pushd toolkit
42+
./scripts/toolchain/check_manifests.sh -a "x86_64"
43+
popd
44+
shell: bash

‎.github/workflows/check-package-cgmanifest.yml‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
3-
3+
---
44
name: Check Package CGManifests
55

66
on:
@@ -20,44 +20,44 @@ jobs:
2020
runs-on: [ubuntu-latest]
2121

2222
steps:
23-
- name: Check out code
24-
uses: actions/checkout@v4
25-
with:
23+
- name: Check out code
24+
uses: actions/checkout@v4
25+
with:
2626
persist-credentials: false
2727

28-
# This PR runner uses an older Ubuntu with rpm version 4.17, which doesn't understand some newer macros like %bcond
29-
- name: Define missing rpm macros
30-
run: |
31-
if [[ -n $(rpm --eval '%bcond test 1') ]]; then
32-
echo '%bcond() %[ (%{2}) ? "%{expand:%%bcond_without %{1}}" : "%{expand:%%bcond_with %{1}}" ]' > ~/.rpmmacros
33-
fi
34-
35-
- name: Get base commit for PRs
36-
if: ${{ github.event_name == 'pull_request' }}
37-
run: |
38-
base_ref="${BASE_REF}"
39-
git fetch origin $base_ref
40-
echo "base_sha=$(git rev-parse origin/$base_ref)" >> "$GITHUB_ENV"
41-
echo "Merging ${{ github.sha }} into $base_ref"
42-
env:
43-
BASE_REF: ${{ github.base_ref }}
44-
45-
- name: Get base commit for Pushes
46-
if: ${{ github.event_name == 'push' }}
47-
run: |
48-
git fetch origin ${{ github.event.before }}
49-
echo "base_sha=${{ github.event.before }}" >> "$GITHUB_ENV"
50-
echo "Merging ${{ github.sha }} into ${{ github.event.before }}"
51-
52-
- name: Get the changed files
53-
run: |
54-
echo "Files changed: '$(git diff-tree --no-commit-id --name-only -r ${{ env.base_sha }} ${{ github.sha }})'"
55-
changed_specs=$(git diff-tree --diff-filter=d --no-commit-id --name-only -r ${{ env.base_sha }} ${{ github.sha }} | { grep "SPECS.*/.*\.spec$" || test $? = 1; } | awk '{printf "%s ", $0}')
56-
echo "Files to validate: '${changed_specs}'"
57-
echo "updated-specs=${changed_specs}" >> "$GITHUB_ENV"
58-
59-
- name: Check each spec
60-
run: |
61-
.github/workflows/overwrite_shell_link.sh
62-
.github/workflows/validate-cg-manifest.sh ${{ env.updated-specs }}
63-
shell: bash
28+
# This PR runner uses an older Ubuntu with rpm version 4.17, which doesn't understand some newer macros like %bcond
29+
- name: Define missing rpm macros
30+
run: |
31+
if [[ -n $(rpm --eval '%bcond test 1') ]]; then
32+
echo '%bcond() %[ (%{2}) ? "%{expand:%%bcond_without %{1}}" : "%{expand:%%bcond_with %{1}}" ]' > ~/.rpmmacros
33+
fi
34+
35+
- name: Get base commit for PRs
36+
if: ${{ github.event_name == 'pull_request' }}
37+
run: |
38+
base_ref="${BASE_REF}"
39+
git fetch origin $base_ref
40+
echo "base_sha=$(git rev-parse origin/$base_ref)" >> "$GITHUB_ENV"
41+
echo "Merging ${{ github.sha }} into $base_ref"
42+
env:
43+
BASE_REF: ${{ github.base_ref }}
44+
45+
- name: Get base commit for Pushes
46+
if: ${{ github.event_name == 'push' }}
47+
run: |
48+
git fetch origin ${{ github.event.before }}
49+
echo "base_sha=${{ github.event.before }}" >> "$GITHUB_ENV"
50+
echo "Merging ${{ github.sha }} into ${{ github.event.before }}"
51+
52+
- name: Get the changed files
53+
run: |
54+
echo "Files changed: '$(git diff-tree --no-commit-id --name-only -r ${{ env.base_sha }} ${{ github.sha }})'"
55+
changed_specs=$(git diff-tree --diff-filter=d --no-commit-id --name-only -r ${{ env.base_sha }} ${{ github.sha }} | { grep "SPECS.*/.*\.spec$" || test $? = 1; } | awk '{printf "%s ", $0}')
56+
echo "Files to validate: '${changed_specs}'"
57+
echo "updated-specs=${changed_specs}" >> "$GITHUB_ENV"
58+
59+
- name: Check each spec
60+
run: |
61+
.github/workflows/overwrite_shell_link.sh
62+
.github/workflows/validate-cg-manifest.sh ${{ env.updated-specs }}
63+
shell: bash

‎.github/workflows/check-source-signatures.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
3-
3+
---
44
name: Source Signature Check
55

66
on:
@@ -16,7 +16,7 @@ permissions: read-all
1616
jobs:
1717
spec-check:
1818
name: Source Signature Check
19-
runs-on: [ ubuntu-latest ]
19+
runs-on: ubuntu-latest
2020
strategy:
2121
matrix:
2222
specs-dir: [SPECS, SPECS-EXTENDED]

‎.github/workflows/check-spec.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
3-
3+
---
44
name: Spec files check
55

66
on:
@@ -16,7 +16,7 @@ permissions: read-all
1616
jobs:
1717
spec-check:
1818
name: Spec files check
19-
runs-on: [ ubuntu-latest ]
19+
runs-on: ubuntu-latest
2020

2121
steps:
2222
# Checkout the branch of our repo that triggered this action

‎.github/workflows/check-static-glibc.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
3-
3+
---
44
name: Static glibc version check
55

66
on:
@@ -16,7 +16,7 @@ permissions: read-all
1616
jobs:
1717
spec-check:
1818
name: Static glibc version check
19-
runs-on: [ ubuntu-latest ]
19+
runs-on: ubuntu-latest
2020

2121
steps:
2222
# Checkout the branch of our repo that triggered this action

0 commit comments

Comments
 (0)