Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Do not set the deb-version manually #154

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
10 changes: 4 additions & 6 deletions dist/build-crates-debian-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -127221,7 +127221,7 @@ async function main(input) {
}
const packages = _cargo__WEBPACK_IMPORTED_MODULE_4__/* .packagesDebian */ .ib(repo);
_actions_core__WEBPACK_IMPORTED_MODULE_2__.info(`Building ${packages.map(p => p.name).join(", ")}`);
_cargo__WEBPACK_IMPORTED_MODULE_4__/* .buildDebian */ .lY(repo, input.target, input.version);
_cargo__WEBPACK_IMPORTED_MODULE_4__/* .buildDebian */ .lY(repo, input.target);
const output = artifactName(repo, input.version, input.target);
await _zip__WEBPACK_IMPORTED_MODULE_6__/* .fromDirectory */ .I(path__WEBPACK_IMPORTED_MODULE_1___default().join(process.cwd(), output), path__WEBPACK_IMPORTED_MODULE_1___default().join(repo, "target", input.target, "debian"), /.*deb/);
const { id } = await artifact.uploadArtifact(output, [output], process.cwd());
Expand Down Expand Up @@ -127500,15 +127500,14 @@ function build(path, target) {
function hostTarget() {
return sh("rustc --version --verbose").match(/host: (?<target>.*)/).groups["target"];
}
function buildDebian(path, target, version) {
function buildDebian(path, target) {
for (const package_ of packagesDebian(path)) {
const manifest = toml.get(package_.manifestPath);
if ("variants" in manifest.package.metadata.deb) {
for (const variant in manifest.package.metadata.deb.variants) {
(0,_command__WEBPACK_IMPORTED_MODULE_5__.sh)(`cargo deb --no-build --no-strip \
--target ${target} \
--package ${package_.name} \
--deb-version ${version} \
--variant ${variant}`, {
cwd: path,
});
Expand All @@ -127517,8 +127516,7 @@ function buildDebian(path, target, version) {
else {
(0,_command__WEBPACK_IMPORTED_MODULE_5__.sh)(`cargo deb --no-build --no-strip \
--target ${target} \
--package ${package_.name} \
--deb-version ${version}`, {
--package ${package_.name}`, {
cwd: path,
});
}
Expand Down Expand Up @@ -127705,7 +127703,7 @@ __webpack_async_result__();


/**
* Create a ZIP archive archive from a directory.
* Create a ZIP archive from a directory.
*
* @param output Absolute path to the output ZIP archive name.
* @param dir Directory containing files to add to the archive.
Expand Down
8 changes: 3 additions & 5 deletions dist/build-crates-standalone-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -127485,15 +127485,14 @@ function build(path, target) {
function hostTarget() {
return (0,_command__WEBPACK_IMPORTED_MODULE_5__.sh)("rustc --version --verbose").match(/host: (?<target>.*)/).groups["target"];
}
function buildDebian(path, target, version) {
function buildDebian(path, target) {
for (const package_ of packagesDebian(path)) {
const manifest = toml.get(package_.manifestPath);
if ("variants" in manifest.package.metadata.deb) {
for (const variant in manifest.package.metadata.deb.variants) {
sh(`cargo deb --no-build --no-strip \
--target ${target} \
--package ${package_.name} \
--deb-version ${version} \
--variant ${variant}`, {
cwd: path,
});
Expand All @@ -127502,8 +127501,7 @@ function buildDebian(path, target, version) {
else {
sh(`cargo deb --no-build --no-strip \
--target ${target} \
--package ${package_.name} \
--deb-version ${version}`, {
--package ${package_.name}`, {
cwd: path,
});
}
Expand Down Expand Up @@ -127719,7 +127717,7 @@ __webpack_async_result__();


/**
* Create a ZIP archive archive from a directory.
* Create a ZIP archive from a directory.
*
* @param output Absolute path to the output ZIP archive name.
* @param dir Directory containing files to add to the archive.
Expand Down
6 changes: 2 additions & 4 deletions dist/bump-crates-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -81206,15 +81206,14 @@ function build(path, target) {
function hostTarget() {
return sh("rustc --version --verbose").match(/host: (?<target>.*)/).groups["target"];
}
function buildDebian(path, target, version) {
function buildDebian(path, target) {
for (const package_ of packagesDebian(path)) {
const manifest = toml.get(package_.manifestPath);
if ("variants" in manifest.package.metadata.deb) {
for (const variant in manifest.package.metadata.deb.variants) {
sh(`cargo deb --no-build --no-strip \
--target ${target} \
--package ${package_.name} \
--deb-version ${version} \
--variant ${variant}`, {
cwd: path,
});
Expand All @@ -81223,8 +81222,7 @@ function buildDebian(path, target, version) {
else {
sh(`cargo deb --no-build --no-strip \
--target ${target} \
--package ${package_.name} \
--deb-version ${version}`, {
--package ${package_.name}`, {
cwd: path,
});
}
Expand Down
6 changes: 2 additions & 4 deletions dist/publish-crates-cargo-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -81094,15 +81094,14 @@ function build(path, target) {
function hostTarget() {
return sh("rustc --version --verbose").match(/host: (?<target>.*)/).groups["target"];
}
function buildDebian(path, target, version) {
function buildDebian(path, target) {
for (const package_ of packagesDebian(path)) {
const manifest = toml.get(package_.manifestPath);
if ("variants" in manifest.package.metadata.deb) {
for (const variant in manifest.package.metadata.deb.variants) {
sh(`cargo deb --no-build --no-strip \
--target ${target} \
--package ${package_.name} \
--deb-version ${version} \
--variant ${variant}`, {
cwd: path,
});
Expand All @@ -81111,8 +81110,7 @@ function buildDebian(path, target, version) {
else {
sh(`cargo deb --no-build --no-strip \
--target ${target} \
--package ${package_.name} \
--deb-version ${version}`, {
--package ${package_.name}`, {
cwd: path,
});
}
Expand Down
10 changes: 4 additions & 6 deletions dist/publish-crates-debian-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -127203,7 +127203,7 @@ async function main(input) {
}
const packages = cargo.packagesDebian(repo);
core.info(`Building ${packages.map(p => p.name).join(", ")}`);
cargo.buildDebian(repo, input.target, input.version);
cargo.buildDebian(repo, input.target);
const output = artifactName(repo, input.version, input.target);
await zip.fromDirectory(path.join(process.cwd(), output), path.join(repo, "target", input.target, "debian"), /.*deb/);
const { id } = await artifact.uploadArtifact(output, [output], process.cwd());
Expand Down Expand Up @@ -127480,15 +127480,14 @@ function build(path, target) {
function hostTarget() {
return sh("rustc --version --verbose").match(/host: (?<target>.*)/).groups["target"];
}
function buildDebian(path, target, version) {
function buildDebian(path, target) {
for (const package_ of packagesDebian(path)) {
const manifest = toml.get(package_.manifestPath);
if ("variants" in manifest.package.metadata.deb) {
for (const variant in manifest.package.metadata.deb.variants) {
sh(`cargo deb --no-build --no-strip \
--target ${target} \
--package ${package_.name} \
--deb-version ${version} \
--variant ${variant}`, {
cwd: path,
});
Expand All @@ -127497,8 +127496,7 @@ function buildDebian(path, target, version) {
else {
sh(`cargo deb --no-build --no-strip \
--target ${target} \
--package ${package_.name} \
--deb-version ${version}`, {
--package ${package_.name}`, {
cwd: path,
});
}
Expand Down Expand Up @@ -127873,7 +127871,7 @@ __webpack_async_result__();


/**
* Create a ZIP archive archive from a directory.
* Create a ZIP archive from a directory.
*
* @param output Absolute path to the output ZIP archive name.
* @param dir Directory containing files to add to the archive.
Expand Down
10 changes: 4 additions & 6 deletions dist/publish-crates-eclipse-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -127203,7 +127203,7 @@ async function main(input) {
}
const packages = cargo.packagesDebian(repo);
core.info(`Building ${packages.map(p => p.name).join(", ")}`);
cargo.buildDebian(repo, input.target, input.version);
cargo.buildDebian(repo, input.target);
const output = artifactName(repo, input.version, input.target);
await zip.fromDirectory(path.join(process.cwd(), output), path.join(repo, "target", input.target, "debian"), /.*deb/);
const { id } = await artifact.uploadArtifact(output, [output], process.cwd());
Expand Down Expand Up @@ -127561,15 +127561,14 @@ function build(path, target) {
function hostTarget() {
return sh("rustc --version --verbose").match(/host: (?<target>.*)/).groups["target"];
}
function buildDebian(path, target, version) {
function buildDebian(path, target) {
for (const package_ of packagesDebian(path)) {
const manifest = toml.get(package_.manifestPath);
if ("variants" in manifest.package.metadata.deb) {
for (const variant in manifest.package.metadata.deb.variants) {
sh(`cargo deb --no-build --no-strip \
--target ${target} \
--package ${package_.name} \
--deb-version ${version} \
--variant ${variant}`, {
cwd: path,
});
Expand All @@ -127578,8 +127577,7 @@ function buildDebian(path, target, version) {
else {
sh(`cargo deb --no-build --no-strip \
--target ${target} \
--package ${package_.name} \
--deb-version ${version}`, {
--package ${package_.name}`, {
cwd: path,
});
}
Expand Down Expand Up @@ -127927,7 +127925,7 @@ __webpack_async_result__();


/**
* Create a ZIP archive archive from a directory.
* Create a ZIP archive from a directory.
*
* @param output Absolute path to the output ZIP archive name.
* @param dir Directory containing files to add to the archive.
Expand Down
10 changes: 4 additions & 6 deletions dist/publish-crates-github-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -127203,7 +127203,7 @@ async function main(input) {
}
const packages = cargo.packagesDebian(repo);
core.info(`Building ${packages.map(p => p.name).join(", ")}`);
cargo.buildDebian(repo, input.target, input.version);
cargo.buildDebian(repo, input.target);
const output = artifactName(repo, input.version, input.target);
await zip.fromDirectory(path.join(process.cwd(), output), path.join(repo, "target", input.target, "debian"), /.*deb/);
const { id } = await artifact.uploadArtifact(output, [output], process.cwd());
Expand Down Expand Up @@ -127561,15 +127561,14 @@ function build(path, target) {
function hostTarget() {
return sh("rustc --version --verbose").match(/host: (?<target>.*)/).groups["target"];
}
function buildDebian(path, target, version) {
function buildDebian(path, target) {
for (const package_ of packagesDebian(path)) {
const manifest = toml.get(package_.manifestPath);
if ("variants" in manifest.package.metadata.deb) {
for (const variant in manifest.package.metadata.deb.variants) {
sh(`cargo deb --no-build --no-strip \
--target ${target} \
--package ${package_.name} \
--deb-version ${version} \
--variant ${variant}`, {
cwd: path,
});
Expand All @@ -127578,8 +127577,7 @@ function buildDebian(path, target, version) {
else {
sh(`cargo deb --no-build --no-strip \
--target ${target} \
--package ${package_.name} \
--deb-version ${version}`, {
--package ${package_.name}`, {
cwd: path,
});
}
Expand Down Expand Up @@ -127903,7 +127901,7 @@ __webpack_async_result__();


/**
* Create a ZIP archive archive from a directory.
* Create a ZIP archive from a directory.
*
* @param output Absolute path to the output ZIP archive name.
* @param dir Directory containing files to add to the archive.
Expand Down
8 changes: 3 additions & 5 deletions dist/publish-crates-homebrew-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -127465,15 +127465,14 @@ function build(path, target) {
function hostTarget() {
return sh("rustc --version --verbose").match(/host: (?<target>.*)/).groups["target"];
}
function buildDebian(path, target, version) {
function buildDebian(path, target) {
for (const package_ of packagesDebian(path)) {
const manifest = toml.get(package_.manifestPath);
if ("variants" in manifest.package.metadata.deb) {
for (const variant in manifest.package.metadata.deb.variants) {
sh(`cargo deb --no-build --no-strip \
--target ${target} \
--package ${package_.name} \
--deb-version ${version} \
--variant ${variant}`, {
cwd: path,
});
Expand All @@ -127482,8 +127481,7 @@ function buildDebian(path, target, version) {
else {
sh(`cargo deb --no-build --no-strip \
--target ${target} \
--package ${package_.name} \
--deb-version ${version}`, {
--package ${package_.name}`, {
cwd: path,
});
}
Expand Down Expand Up @@ -127877,7 +127875,7 @@ __webpack_async_result__();


/**
* Create a ZIP archive archive from a directory.
* Create a ZIP archive from a directory.
*
* @param output Absolute path to the output ZIP archive name.
* @param dir Directory containing files to add to the archive.
Expand Down
2 changes: 1 addition & 1 deletion src/build-crates-debian.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export async function main(input: Input) {
const packages = cargo.packagesDebian(repo);
core.info(`Building ${packages.map(p => p.name).join(", ")}`);

cargo.buildDebian(repo, input.target, input.version);
cargo.buildDebian(repo, input.target);

const output = artifactName(repo, input.version, input.target);
await zip.fromDirectory(
Expand Down
6 changes: 2 additions & 4 deletions src/cargo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ export function hostTarget(): string {
return sh("rustc --version --verbose").match(/host: (?<target>.*)/).groups["target"];
}

export function buildDebian(path: string, target: string, version: string) {
export function buildDebian(path: string, target: string) {
for (const package_ of packagesDebian(path)) {
const manifest = toml.get(package_.manifestPath) as CargoManifest;

Expand All @@ -335,7 +335,6 @@ export function buildDebian(path: string, target: string, version: string) {
`cargo deb --no-build --no-strip \
--target ${target} \
--package ${package_.name} \
--deb-version ${version} \
--variant ${variant}`,
{
cwd: path,
Expand All @@ -346,8 +345,7 @@ export function buildDebian(path: string, target: string, version: string) {
sh(
`cargo deb --no-build --no-strip \
--target ${target} \
--package ${package_.name} \
--deb-version ${version}`,
--package ${package_.name}`,
{
cwd: path,
},
Expand Down
2 changes: 1 addition & 1 deletion src/zip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as os from "os";
import { sh } from "./command";

/**
* Create a ZIP archive archive from a directory.
* Create a ZIP archive from a directory.
*
* @param output Absolute path to the output ZIP archive name.
* @param dir Directory containing files to add to the archive.
Expand Down