Skip to content

Commit

Permalink
Merge pull request #1835 from lann/purge-bindle
Browse files Browse the repository at this point in the history
Remove bindle
  • Loading branch information
lann authored Oct 3, 2023
2 parents 981732a + c024e89 commit 179f78c
Show file tree
Hide file tree
Showing 30 changed files with 34 additions and 1,910 deletions.
3 changes: 0 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ FROM mcr.microsoft.com/vscode/devcontainers/rust:0-${VARIANT}
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# && apt-get -y install --no-install-recommends <your-package-list-here>

ARG BINDLE_URL="https://github.com/deislabs/bindle/releases/download/v0.8.0/bindle-v0.8.0-linux-amd64.tar.gz"
RUN curl -sL "$BINDLE_URL" | tar -xzf - -C /usr/local/bin bindle bindle-server

# Go installation, see https://go.dev/doc/install
ARG GO_URL="https://go.dev/dl/go1.20.1.linux-amd64.tar.gz"
RUN curl -sL "$GO_URL" | tar -xzf - -C /usr/local
Expand Down
1 change: 0 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
"matklad.rust-analyzer",
"tamasfe.even-better-toml",
"serayuzgur.crates",
"fermyon.autobindle",
"golang.Go",
"grain-lang.vscode-grain"
],
Expand Down
18 changes: 0 additions & 18 deletions .github/actions/spin-ci-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,6 @@ inputs:
default: 'false'
type: bool

bindle:
description: 'setup bindle'
required: false
default: 'false'
type: bool
bindle-version:
description: 'Bindle version to setup'
default: 'v0.8.0'
required: false
type: string

nomad:
description: 'setup nomad'
required: false
Expand Down Expand Up @@ -98,13 +87,6 @@ runs:
with:
shared-key: "${{ runner.os }}-full-${{ hashFiles('./Cargo.lock') }}"

## Install bindle
- name: Install bindle
uses: rajatjindal/setup-actions/[email protected]
if: ${{ inputs.bindle == 'true' }}
with:
version: ${{ inputs.bindle-version }}

## Install nomad
- name: Install nomad
uses: endocrimes/[email protected]
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ jobs:
rust: true
rust-wasm: true
rust-cache: true
bindle: true
nomad: true

# FIXME: THIS IS THE SHORTEST-TERM OF ALL SHORT-TERM FIXES
Expand Down Expand Up @@ -153,7 +152,6 @@ jobs:
uses: ./.github/actions/spin-ci-dependencies
with:
rust: true
bindle: true
golang: true
tinygo: true
wasmtime: true
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/code-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ jobs:
with:
rust: true
rust-wasm: true
bindle: true
nomad: true

- name: Install cargo-tarpaulin binary crate
Expand Down
Loading

0 comments on commit 179f78c

Please sign in to comment.