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

minor repo cleanup #1340

Merged
merged 2 commits into from
Sep 4, 2024
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:
jobs:
golangci:
name: Lint
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
8 changes: 3 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ simplify:
gofmt -w -l -s .

# Generate version information
version/commit.txt: FORCE
version/commit.txt:
git rev-parse --verify HEAD > version/commit.txt

version/version.txt: FORCE
version/version.txt:
if [ -z "$(GIT_VERSION)" ]; then \
echo "dev" > version/version.txt; \
else \
Expand Down Expand Up @@ -155,6 +155,4 @@ help:
@echo 'make rock - Build the JIMM rock.'
@echo 'make load-rock - Load the most recently built rock into your local docker daemon.'

.PHONY: build check install release clean format server simplify sys-deps help FORCE

FORCE:
.PHONY: build check install release clean format server simplify sys-deps help
9 changes: 9 additions & 0 deletions charms/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
# JIMM Charms

Charms are a packaging tool for deploying application using Juju.
See more on charms [here](https://juju.is/charms-architecture).

JIMM has a machine charm and a Kubernetes charm for deploying the
application on different substrates. Currently the machine charm
is not maintained in favor of the K8s charm.

The machine charm has not yet been moved to a separate repo.

## K8S Charm
The K8S charm can be found [here](https://github.com/canonical/jimm-k8s-operator/).
276 changes: 0 additions & 276 deletions doc/dev-deploy.md

This file was deleted.

3 changes: 3 additions & 0 deletions doc/jimm-facade.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
JIMM Facade
===========

>This document is out of date and requires rework to include details
>on new JIMM specific facades.

In addition to the facades required to emulate a juju controller, JIMM
also advertises a JIMM facade with some additional features.

Expand Down
Loading