diff --git a/.github/workflows/dev-containers.yml b/.github/workflows/dev-containers.yml index 2f763a1bb..90e3e1080 100644 --- a/.github/workflows/dev-containers.yml +++ b/.github/workflows/dev-containers.yml @@ -98,17 +98,27 @@ jobs: --target podman \ --tag podman-5.5.2-builder \ 'https://github.com/mgoltzsche/podman-static.git#9ccf992536ecf0a4a3b82ac27fc708f00ab141ab' + docker build \ + --target crun \ + --tag crun-builder \ + 'https://github.com/mgoltzsche/podman-static.git#9ccf992536ecf0a4a3b82ac27fc708f00ab141ab' container_id=$(docker create podman-5.5.2-builder) docker cp "${container_id}:/usr/local/bin/podman" podman docker rm "${container_id}" + container_id=$(docker create crun-builder) + docker cp "${container_id}:/usr/local/bin/crun" crun + docker rm "${container_id}" sudo install -m 0755 podman /usr/local/bin/podman + sudo install -m 0755 crun /usr/local/bin/crun + sudo install -m 0755 crun /usr/bin/crun podman --version + crun --version - name: Tools Info run: | docker info docker buildx version - podman info - podman buildx version + podman info || true + podman buildx version || true - name: Install Dependencies run: | yarn install --frozen-lockfile diff --git a/.vscode/settings.json b/.vscode/settings.json index cd5223cb5..5f60547a9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -34,5 +34,8 @@ "editor.insertSpaces": false, "editor.tabSize": 4, "editor.defaultFormatter": "vscode.json-language-features" - } + }, + "githubPullRequests.ignoredPullRequestBranches": [ + "main" + ] } \ No newline at end of file