Skip to content

Commit 0c4c4ec

Browse files
authored
Merge branch 'main' into remove-openai-custom-providers
2 parents d844e65 + 8f74e95 commit 0c4c4ec

File tree

98 files changed

+4050
-2636
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+4050
-2636
lines changed

.config/dictionary.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Fqcn
1111
Fqcns
1212
Infiles
1313
KUBEDOCK
14+
Konflux
1415
LIGHTSPEED
1516
Lightspeed
1617
Lightspeed's
@@ -20,6 +21,7 @@ Modelines
2021
Npmjs
2122
OPTSTRING
2223
PKGMGR
24+
PYCMD
2325
PYTHONBREAKPOINT
2426
RHSSO
2527
TASKFILE
@@ -29,6 +31,7 @@ Tomasz
2931
Towncrier
3032
antsibull
3133
autofetch
34+
bindep
3235
cfgs
3336
checode
3437
chromedriver
@@ -38,6 +41,7 @@ contentmatch
3841
contentmatches
3942
contentmatching
4043
coreutils
44+
cpython
4145
dedupe
4246
depcheck
4347
devfile
@@ -52,6 +56,7 @@ hostsvars
5256
hostvars
5357
icontent
5458
johndoe
59+
konflux
5560
lextudio
5661
libgbm
5762
libonig
@@ -88,6 +93,7 @@ servernum
8893
shiki
8994
showformat
9095
sonarcloud
96+
sshpass
9197
suboption
9298
suboptions
9399
sysninja

.config/mise.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ _.file = { path = ".env", tools = true }
2424
# Needs to be enabled for hooks to work
2525
experimental = true
2626
idiomatic_version_file_enable_tools = ["python"]
27+
lockfile = true
2728

2829
[tools]
2930
gh = "latest"

.dockerignore

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
*
2-
!.pre-commit-config.yaml
3-
!.python-version
4-
!.config/mise*.*
5-
!pyproject.toml
6-
!uv.lock
1+
# Used by both Containerfile and vscode-ansible.Containerfile
2+
*.vsix
3+
.cache/
4+
.ruff_cache/
5+
.trunk/
6+
.vscode-test/
7+
node_modules/
8+
out/
9+
site
10+
.git/hooks/

.gitattributes

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# Set default behavior to automatically normalize line endings.
22
* text=auto eol=lf
3-
*.mp4 filter=lfs diff=lfs merge=lfs -text
4-
*.webp filter=lfs diff=lfs merge=lfs -text
5-
*.webm filter=lfs diff=lfs merge=lfs -text
6-
*.gif filter=lfs diff=lfs merge=lfs -text
7-
*.png filter=lfs diff=lfs merge=lfs -text
3+
4+
# Binary files - no text normalization
5+
*.mp4 binary
6+
*.webp binary
7+
*.webm binary
8+
*.gif binary
9+
*.png binary

.github/actions/setup/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ inputs:
88
runs:
99
using: "composite"
1010
steps:
11-
- uses: jdx/mise-action@5ac50f778e26fac95da98d50503682459e86d566 # v3.2.0
11+
- uses: jdx/mise-action@9dc7d5dd454262207dea3ab5a06a3df6afc8ff26 # v3.4.1
1212
with:
1313
experimental: true
1414
reshim: true
@@ -28,10 +28,10 @@ runs:
2828
path: |
2929
~/.cache/pip
3030
~/.cache/uv
31-
key: py-${{ env.IMAGE_OS_VERSION }}-${{ matrix.task-name }}-${{ hashFiles('uv.lock', '.python_version') }}
31+
key: py-${{ env.IMAGE_OS_VERSION }}-${{ matrix.task-name }}-${{ hashFiles('uv.lock', '.python-version') }}
3232

3333
- name: Enable caching for pre-commit
34-
if: ${{ inputs.jop_name == 'lint' || inputs.job_name == 'preflight' }}
34+
if: ${{ inputs.job_name == 'lint' || inputs.job_name == 'preflight' }}
3535
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
3636
with:
3737
path: ~/.cache/pre-commit/

.github/workflows/builder.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: builder
2+
on:
3+
push:
4+
branches:
5+
- main
6+
- "releases/**"
7+
- "stable/**"
8+
paths:
9+
- .config/mise*.toml
10+
- .dockerignore
11+
- .pre-commit-config.yaml
12+
- .python-version
13+
- Containerfile
14+
- package*.json
15+
- pyproject.toml
16+
- tools/builder.sh
17+
- uv.lock
18+
pull_request:
19+
types: [synchronize, opened, reopened]
20+
branches: ["main", "devel/*"]
21+
paths:
22+
- .config/mise*.toml
23+
- .dockerignore
24+
- .pre-commit-config.yaml
25+
- .python-version
26+
- Containerfile
27+
- package*.json
28+
- pyproject.toml
29+
- tools/builder.sh
30+
- uv.lock
31+
jobs:
32+
builder-image:
33+
runs-on: ubuntu-24.04
34+
permissions:
35+
contents: read
36+
packages: write
37+
steps:
38+
- name: Checkout repository
39+
uses: actions/checkout@v5
40+
with:
41+
fetch-depth: 0
42+
43+
- name: Install the latest version of uv
44+
uses: astral-sh/setup-uv@v7
45+
46+
- name: Log in to GitHub Container Registry
47+
uses: docker/login-action@v3
48+
with:
49+
registry: ghcr.io
50+
username: ${{ github.actor }}
51+
password: ${{ secrets.GITHUB_TOKEN }}
52+
53+
- name: Build and push container image
54+
env:
55+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
56+
run: ./tools/builder.sh ${{ github.ref == 'refs/heads/main' && github.event_name == 'push' && '--push' || '' }}

.github/workflows/ci.yaml

Lines changed: 37 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,15 @@ jobs:
4545
preflight:
4646
runs-on: ubuntu-24.04
4747
container:
48-
image: ghcr.io/jdx/mise:latest
48+
image: ghcr.io/ansible/ext-builder:latest
4949
env:
50+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5051
MISE_TRUSTED_CONFIG_PATHS: /
5152
continue-on-error: false
5253
outputs:
5354
commit_context: ${{ steps.extract_context.outputs.context }}
5455
steps:
55-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
56+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
5657
with:
5758
fetch-depth: 0 # we need tags for dynamic versioning
5859
show-progress: false
@@ -70,6 +71,10 @@ jobs:
7071
mise exec -- printenv NODE_OPTIONS || true
7172
task setup
7273
74+
- name: Install ansible-dev-tools
75+
run: |
76+
pip install ansible-dev-tools
77+
7378
- name: Extract commit context from conventional commit
7479
id: extract_context
7580
shell: bash
@@ -103,18 +108,30 @@ jobs:
103108
task build
104109
105110
- name: Run context-specific command
106-
if: steps.extract_context.outputs.context != '' && steps.extract_context.outputs.context != 'build'
111+
if: >-
112+
steps.extract_context.outputs.context != '' &&
113+
!contains(fromJSON('["build", "deps", "docs", "lint"]'), steps.extract_context.outputs.context)
107114
run: |
108-
task ${{ steps.extract_context.outputs.context }}"
115+
task ${{ steps.extract_context.outputs.context }}
109116
110117
- name: task lint
111-
timeout-minutes: 2 # expected under 1 minutes
118+
timeout-minutes: 4
112119
run: |
113120
task lint
114121
122+
- name: task docs
123+
timeout-minutes: 1
124+
run: |
125+
task docs
126+
127+
- name: task package
128+
timeout-minutes: 2
129+
run: |
130+
task package
131+
115132
build:
116133
name: ${{ matrix.name }}
117-
needs: preflight
134+
118135
environment: ci
119136
env:
120137
SKIP_DOCKER: ${{ matrix.env.SKIP_DOCKER || 0 }}
@@ -144,23 +161,13 @@ jobs:
144161
os:
145162
- ubuntu-24.04
146163
task-name:
147-
- docs
164+
- test (linux)
148165
name:
149-
- docs
166+
- test (linux)
150167
include:
151-
- name: lint
152-
task-name: lint
153-
os: ubuntu-24.04
154-
env:
155-
SKIP_PODMAN: 1
156-
SKIP_DOCKER: 1
157-
158-
- name: test (linux)
159-
task-name: test
160-
161168
- name: test (macos)
162169
task-name: test
163-
os: macos-13-large
170+
os: macos-15-large
164171
env:
165172
SKIP_PODMAN: 1
166173
SKIP_DOCKER: 1
@@ -176,7 +183,7 @@ jobs:
176183
SKIP_PODMAN: 1
177184
SKIP_DOCKER: 1
178185
steps:
179-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
186+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
180187
with:
181188
fetch-depth: 0 # we need tags for dynamic versioning
182189
show-progress: false
@@ -480,21 +487,21 @@ jobs:
480487

481488
steps:
482489
- name: Checkout Source # needed by codecov uploader
483-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
490+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
484491
with:
485492
fetch-depth: 0
486493

487494
- name: Merge logs into a single archive
488495
if: ${{ !failure() }}
489-
uses: actions/upload-artifact/merge@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
496+
uses: actions/upload-artifact/merge@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
490497
with:
491498
name: logs.zip
492499
pattern: logs-*.zip
493500
separate-directories: true
494501
delete-merged: true
495502

496503
- name: Download artifacts
497-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
504+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
498505
with:
499506
path: .
500507

@@ -590,7 +597,7 @@ jobs:
590597
run: |
591598
if [ -n "$SLACK_WEBHOOK_URL" ]; then
592599
curl -X POST -H 'Content-type: application/json' \
593-
--data "{\"text\":\" Python tests failed in jobs: test for '${GITHUB_REPOSITORY}' (tox.yml). Check logs: '${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}'\"}" \
600+
--data "{\"text\":\" Main branch tests failed on `${GITHUB_REPOSITORY}`. Check [logs](${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID})\"}" \
594601
$SLACK_WEBHOOK_URL
595602
fi
596603
@@ -602,7 +609,7 @@ jobs:
602609
- check
603610
steps:
604611
- name: Checkout Source
605-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
612+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
606613
with:
607614
fetch-depth: 0
608615

@@ -611,16 +618,16 @@ jobs:
611618
corepack enable
612619
npm config set fund false
613620
614-
- uses: jdx/mise-action@5ac50f778e26fac95da98d50503682459e86d566 # v3.2.0
621+
- uses: jdx/mise-action@9dc7d5dd454262207dea3ab5a06a3df6afc8ff26 # v3.4.1
615622

616623
- name: Download the artifact
617-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
624+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
618625
with:
619626
name: ansible-extension-build-${{ github.event.number || github.run_id }}.zip
620627

621628
- name: Attach vsix to Github release
622629
# cspell: ignore softprops
623-
uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
630+
uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2.4.2
624631
if: github.ref_type == 'tag'
625632
with:
626633
files: "*.vsix"
@@ -650,11 +657,11 @@ jobs:
650657
- check
651658
steps:
652659
- name: Download the artifact
653-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
660+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
654661
with:
655662
name: "@ansible-ansible-language-server-build-${{ github.event.number || github.run_id }}.tgz"
656663

657-
- uses: jdx/mise-action@5ac50f778e26fac95da98d50503682459e86d566 # v3.2.0
664+
- uses: jdx/mise-action@9dc7d5dd454262207dea3ab5a06a3df6afc8ff26 # v3.4.1
658665

659666
- run: npm publish --access public @ansible-ansible-language-server-*.tgz
660667
env:

.markdownlint-cli2.jsonc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"gitignore": true
3+
}

.markdownlintignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

.markdownlintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
node_modules
2+
packages/ansible-mcp-server/node_modules
3+
docs/als/settings.md

0 commit comments

Comments
 (0)