diff --git a/.github/workflows/__test-proxy.yml b/.github/workflows/__test-proxy.yml index 322a66055a..6e3a0944ef 100644 --- a/.github/workflows/__test-proxy.yml +++ b/.github/workflows/__test-proxy.yml @@ -29,6 +29,8 @@ jobs: include: - os: ubuntu-latest version: linked + - os: ubuntu-latest + version: nightly-latest name: Proxy test permissions: contents: read @@ -43,6 +45,17 @@ jobs: python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 + env: + https_proxy: http://squid-proxy:3128 + CODEQL_ACTION_TEST_MODE: true + - name: Set up GitHub CLI + run: | + apt update + apt install -y curl libreadline8 gnupg2 software-properties-common zstd + curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg + apt-key add /usr/share/keyrings/githubcli-archive-keyring.gpg + apt-add-repository https://cli.github.com/packages + apt install -y gh - name: Prepare test id: prepare-test uses: ./.github/actions/prepare-test @@ -50,17 +63,23 @@ jobs: version: ${{ matrix.version }} use-all-platform-bundle: 'false' setup-kotlin: 'false' + env: + https_proxy: http://squid-proxy:3128 + CODEQL_ACTION_TEST_MODE: true - uses: ./../action/init with: languages: javascript tools: ${{ steps.prepare-test.outputs.tools-url }} + env: + https_proxy: http://squid-proxy:3128 + CODEQL_ACTION_TEST_MODE: true - uses: ./../action/analyze - env: - https_proxy: http://squid-proxy:3128 - CODEQL_ACTION_TEST_MODE: true + env: + https_proxy: http://squid-proxy:3128 + CODEQL_ACTION_TEST_MODE: true container: image: ubuntu:22.04 - options: --dns 127.0.0.1 + options: --dns 8.8.8.8 services: squid-proxy: image: ubuntu/squid:latest diff --git a/pr-checks/checks/test-proxy.yml b/pr-checks/checks/test-proxy.yml index d1c6209e27..5574ae260e 100644 --- a/pr-checks/checks/test-proxy.yml +++ b/pr-checks/checks/test-proxy.yml @@ -1,6 +1,6 @@ name: "Proxy test" description: "Tests using a proxy specified by the https_proxy environment variable" -versions: ["linked"] +versions: ["linked", "nightly-latest"] operatingSystems: ["ubuntu"] container: image: ubuntu:22.04 diff --git a/pr-checks/justfile b/pr-checks/justfile new file mode 100644 index 0000000000..201d24959a --- /dev/null +++ b/pr-checks/justfile @@ -0,0 +1,7 @@ +# Perform all necessary steps to update the PR checks +update-pr-checks: + python3 -m venv env + env/bin/activate + pip3 install ruamel.yaml + python3 sync.py + git apply pr-checks.patch diff --git a/pr-checks/test-proxy.patch b/pr-checks/test-proxy.patch new file mode 100644 index 0000000000..ae8a87d665 --- /dev/null +++ b/pr-checks/test-proxy.patch @@ -0,0 +1,18 @@ +diff --git a/.github/workflows/__test-proxy.yml b/.github/workflows/__test-proxy.yml +index b6831b7a0..3be758b02 100644 +--- a/.github/workflows/__test-proxy.yml ++++ b/.github/workflows/__test-proxy.yml +@@ -45,6 +45,13 @@ jobs: + python-version: '3.11' + - name: Check out repository + uses: actions/checkout@v4 ++ - name: Set up GitHub CLI ++ run: | ++ curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg ++ sudo apt-key add /usr/share/keyrings/githubcli-archive-keyring.gpg ++ sudo apt-add-repository https://cli.github.com/packages ++ sudo apt-get update ++ sudo apt-get install gh + - name: Prepare test + id: prepare-test + uses: ./.github/actions/prepare-test