diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml index 0a177860..01aeca45 100644 --- a/.github/workflows/build-images.yml +++ b/.github/workflows/build-images.yml @@ -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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a484280..4f762dd0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 @@ -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: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a93ba5c5..ab175c0e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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 diff --git a/Cargo.toml b/Cargo.toml index ea40f880..972f87fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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"] } @@ -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) diff --git a/wix/main.wxs b/wix/main.wxs deleted file mode 100644 index 1c4b7acd..00000000 --- a/wix/main.wxs +++ /dev/null @@ -1,215 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -