Skip to content

Commit

Permalink
Bump cargo-dist to 0.4.1 (#320)
Browse files Browse the repository at this point in the history
Signed-off-by: Sergio Castaño Arteaga <[email protected]>
  • Loading branch information
tegioz authored Oct 31, 2023
1 parent 9d0107a commit eed5f1a
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 227 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build-landscape2-image:
if: github.ref == 'refs/heads/main'
runs-on:
labels: ubuntu-latest-8-cores
labels: ubuntu-latest-16-cores
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
lint-cli-tool:
runs-on:
labels: ubuntu-latest-8-cores
labels: ubuntu-latest-16-cores
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -33,7 +33,7 @@ jobs:

test-cli-tool:
runs-on:
labels: ubuntu-latest-8-cores
labels: ubuntu-latest-16-cores
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -50,7 +50,7 @@ jobs:

lint-and-test-webapp:
runs-on:
labels: ubuntu-latest-8-cores
labels: ubuntu-latest-16-cores
env:
NODE_OPTIONS: --max_old_space_size=4096
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
with:
submodules: recursive
- name: Install cargo-dist
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.4.0/cargo-dist-installer.sh | sh"
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.4.1/cargo-dist-installer.sh | sh"
- id: plan
run: |
cargo dist plan ${{ !github.event.pull_request && format('--tag={0}', github.ref_name) || '' }} --output-format=json > dist-manifest.json
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
with:
submodules: recursive
- name: Install cargo-dist
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.4.0/cargo-dist-installer.sh | sh"
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.4.1/cargo-dist-installer.sh | sh"
# Get all the local artifacts for the global tasks to use (for e.g. checksums)
- name: Fetch local artifacts
uses: actions/download-artifact@v3
Expand Down
9 changes: 3 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@ license = "Apache-2.0"
edition = "2021"
rust-version = "1.70"
repository = "https://github.com/cncf/landscape2"
readme = "README.md"
authors = ["Sergio Castaño Arteaga", "Cintia Sanchez Garcia"]

[package.metadata.wix]
upgrade-guid = "CFDCA2AA-9CB2-49B1-98DD-9BE9BC4DC28F"
path-guid = "59B0489F-30BD-45E2-B29C-C87F970B4138"

[dependencies]
anyhow = "1.0.75"
askama = { version = "0.12.1", features = ["serde-json"] }
Expand Down Expand Up @@ -76,11 +73,11 @@ lto = "thin"
# Config for 'cargo dist'
[workspace.metadata.dist]
# The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax)
cargo-dist-version = "0.4.0"
cargo-dist-version = "0.4.1"
# CI backends to support
ci = ["github"]
# The installers to generate for each app
installers = ["shell", "powershell", "homebrew", "msi"]
installers = ["shell", "powershell", "homebrew"]
# A GitHub repo to push Homebrew formulas to
tap = "cncf/homebrew-landscape2"
# Target platforms to build apps for (Rust target-triple syntax)
Expand Down
215 changes: 0 additions & 215 deletions wix/main.wxs

This file was deleted.

0 comments on commit eed5f1a

Please sign in to comment.