Skip to content

Commit 06230ec

Browse files
committed
ci: fix downloading of artifacts + docker cache [skip test]
1 parent a03cb7e commit 06230ec

File tree

4 files changed

+16
-17
lines changed

4 files changed

+16
-17
lines changed

Diff for: .github/workflows/CI.yml

+13-14
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,12 @@ name: CI
22
on:
33
pull_request:
44
push:
5-
branches:
6-
- master
7-
- main
8-
- dev
95
tags:
106
- "*"
117
workflow_dispatch:
128

139
concurrency:
14-
group: ${{ github.workflow }}-${{ github.head_ref }}
10+
group: ${{ github.workflow }}-${{ github.ref }}
1511
cancel-in-progress: true
1612

1713
env:
@@ -255,6 +251,8 @@ jobs:
255251
file: ./dev/docker/ci/${{ matrix.container.file }}
256252
push: ${{ github.event_name != 'pull_request' }}
257253
tags: aminya/${{ matrix.container.image }}:${{ matrix.container.tag }},aminya/${{ matrix.container.image }}:latest
254+
cache-from: type=registry,ref=user/app:latest
255+
cache-to: type=inline
258256

259257
- name: Test
260258
uses: docker/build-push-action@v6
@@ -266,19 +264,20 @@ jobs:
266264

267265
Release:
268266
if: startsWith(github.ref, 'refs/tags/')
269-
needs: [Build, BuildExecutable, Test, Docker]
267+
needs: [Build, BuildExecutable, Test]
270268
runs-on: ubuntu-24.04
271269
steps:
272-
- name: Download All Artifacts
270+
- name: Download Executables
273271
uses: actions/download-artifact@v4
272+
with:
273+
pattern: exe-*
274+
path: exe/
274275

275-
- name: Place Artifacts
276-
shell: bash
277-
run: |
278-
mv -v ./dist/ ./dist-artifacts
279-
mv -v ./dist-artifacts/* ./
280-
281-
chmod +x -R ./exe/
276+
- name: Download Dist
277+
uses: actions/download-artifact@v4
278+
with:
279+
name: dist
280+
path: dist/
282281

283282
- name: Draft the release
284283
uses: meeDamian/[email protected]

Diff for: dist/legacy/setup-cpp.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: dist/modern/setup-cpp.mjs.map

+1-1
Large diffs are not rendered by default.

Diff for: src/llvm/llvm_url.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { arm64, armv7, powerpc64le, sparc64, sparcv9, x86, x86_64 } from "../uti
77
import { hasDnf } from "../utils/env/hasDnf.js"
88
import { isUbuntu } from "../utils/env/isUbuntu.js"
99
import { ubuntuVersion } from "../utils/env/ubuntu_version.js"
10-
import { extractExe, extractTarByExe, getArchiveType, getExtractFunction } from "../utils/setup/extract.js"
10+
import { extractTarByExe, getArchiveType, getExtractFunction } from "../utils/setup/extract.js"
1111
import type { PackageInfo } from "../utils/setup/setupBin.js"
1212

1313
const dirname = typeof __dirname === "string" ? __dirname : path.dirname(fileURLToPath(import.meta.url))

0 commit comments

Comments
 (0)