ivabus/pantry
1
0
Fork 0
mirror of https://github.com/ivabus/pantry synced 2024-11-26 18:25:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix uploads

Browse source
This commit is contained in:
Max Howell 2022-10-17 15:20:42 -04:00
parent 947b26aa7b
commit cf07590f11
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View file

@ -99,7 +99,7 @@ jobs:
- run: - run:
tar czf $GITHUB_WORKSPACE/artifacts.tgz tar czf $GITHUB_WORKSPACE/artifacts.tgz
${{ steps.build.outputs.relative-paths }} ${{ steps.build.outputs.relative-paths }}
${{ steps.build.outputs.srcs-actual }} ${{ steps.build.outputs.srcs-relative-paths }}
working-directory: ${{ steps.tea.outputs.prefix }} working-directory: ${{ steps.tea.outputs.prefix }}
- name: upload artifacts - name: upload artifacts

7
scripts/build.ts
View file

@ -54,11 +54,12 @@ for (const rq of dry) {
} }
} }
const to = usePrefix()
await set_output("pkgs", rv.map(x => pkgutils.str(x.installation.pkg))) await set_output("pkgs", rv.map(x => pkgutils.str(x.installation.pkg)))
await set_output("paths", rv.map(x => x.installation.path), '%0A') await set_output("paths", rv.map(x => x.installation.path), '%0A')
await set_output("relative-paths", rv.map(x => x.installation.path.relative({ to: usePrefix() }))) await set_output("relative-paths", rv.map(x => x.installation.path.relative({ to })))
await set_output("srcs", rv.map(x => x.src?.relative({ to: usePrefix() }) ?? "~")) await set_output("srcs", rv.map(x => x.src?.relative({ to }) ?? "~"))
await set_output("srcs-actual", rv.compact(x => x.src?.relative({ to: usePrefix() }))) await set_output("srcs-relative-paths", rv.compact(x => x.src?.relative({ to })))
interface InstallationPlus extends Installation { interface InstallationPlus extends Installation {
src: Path src: Path

2
scripts/fetch.ts
View file

@ -24,7 +24,7 @@ const pantry = usePantry()
const { download } = useDownload() const { download } = useDownload()
export async function fetch_src(pkg: Package): Promise<[Path, Path] | undefined> { export async function fetch_src(pkg: Package): Promise<[Path, Path] | undefined> {
const dstdir = useCellar().shelf(pkg.project).parent().join("src", `v${pkg.version}`) const dstdir = useCellar().shelf(pkg.project).join("src", `v${pkg.version}`)
const dist = await pantry.getDistributable(pkg) const dist = await pantry.getDistributable(pkg)
if (!dist) return if (!dist) return
const { url, stripComponents } = dist const { url, stripComponents } = dist

4
scripts/upload.ts
View file

@ -12,7 +12,7 @@ args:
import { S3 } from "s3" import { S3 } from "s3"
import { pkg as pkgutils } from "utils" import { pkg as pkgutils } from "utils"
import { useFlags, useOffLicense, useCache } from "hooks" import { useFlags, useOffLicense, useCache, usePrefix } from "hooks"
import { Package, PackageRequirement } from "types" import { Package, PackageRequirement } from "types"
import SemVer, * as semver from "semver" import SemVer, * as semver from "semver"
import { dirname, basename } from "deno/path/mod.ts" import { dirname, basename } from "deno/path/mod.ts"
@ -82,7 +82,7 @@ for (const [index, pkg] of pkgs.entries()) {
// mirror the sources // mirror the sources
if (srcs[index] != "~") { if (srcs[index] != "~") {
const src = new Path(srcs[index]) const src = usePrefix().join(srcs[index])
const srcKey = useOffLicense('s3').key({ const srcKey = useOffLicense('s3').key({
pkg: stowed.pkg, pkg: stowed.pkg,
type: "src", type: "src",