Skip to content
This repository has been archived by the owner on Oct 9, 2024. It is now read-only.

Update creator ee #637

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/ansible/creator-ee:v0.22.0 as DEFAULT_EE
FROM quay.io/ansible/creator-ee:v24.2.0 as DEFAULT_EE
# This file is updated by dependabot and used to determine not only which
# version of creator-ee we are supposed to use for testing execution
# environments but also to dynamically retrieve the same set of constraints
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/task.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ jobs:
if: ${{ always() }}
run: |
mkdir -p out/vscode
cp -r ../vscode-ansible/out/userdata/logs/* out/vscode || true
cp -r ../vscode-ansible/out/log/* out/vscode || echo "::error:: Copy logs failed"

- name: Upload test logs
if: ${{ always() }}
Expand Down
2 changes: 1 addition & 1 deletion tools/test-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ if [[ -f "/usr/bin/apt-get" ]]; then
INSTALL=0
# qemu-user-static is required by podman on arm64
# python3-dev is needed for headers as some packages might need to compile
DEBS=(curl git python3-dev python3-venv python3-pip qemu-user-static)
DEBS=(curl git python3-dev python3-venv python3-pip qemu-user-static xvfb x11-xserver-utils)
for DEB in "${DEBS[@]}"; do
[[ "$(dpkg-query --show --showformat='${db:Status-Status}\n' \
"${DEB}" || true)" != 'installed' ]] && INSTALL=1
Expand Down
3 changes: 2 additions & 1 deletion tools/vscode.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ cleanup() {

if [[ -f "/usr/bin/apt-get" ]]; then
trap "cleanup" SIGINT SIGTERM ERR EXIT
xvfb-run --auto-servernum task devel -- ../ansible-language-server
sudo apt-get -qq install -y xvfb
xvfb-run -e /dev/stdout --auto-servernum task devel -- ../ansible-language-server
else
task devel -- ../ansible-language-server
fi
Loading