Skip to content

Commit

Permalink
chore(build): seperate deploy and build dir (labring#1219)
Browse files Browse the repository at this point in the history
  • Loading branch information
maslow authored Jun 6, 2023
1 parent 806fcbd commit dfeed5a
Show file tree
Hide file tree
Showing 137 changed files with 13 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-scripts-updated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ on:
branches:
- main
paths:
- "deploy/build/**"
- "deploy/scripts/**"
- "build/**"
- "deploy/**"
- ".github/workflows/build-scripts-updated.yml"
- ".github/workflows/build-sealos-cluster-image.yml"
- "!**/*.md"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-sealos-cluster-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: build-sealos-cluster-image

on:
repository_dispatch:
types: [docker_build_success,build-scripts-updated]
types: [docker_build_success, build-scripts-updated]
workflow_dispatch:

env:
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
env:
IMAGE: ghcr.io/${{ github.repository_owner }}/${{ env.image }}
VERSION: ${{ env.tag }}
working-directory: deploy/build
working-directory: build
run: |
echo $IMAGE:$VERSION
sudo sealos build -t $IMAGE:$VERSION-arm64 --platform linux/arm64 -f Kubefile .
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Remove builtin docker
run: |
sudo apt-get remove -y moby-engine moby-cli moby-buildx moby-compose
- name: Deploy laf
env:
DOMAIN: ${{ env.DOMAIN }}
working-directory: deploy/scripts
working-directory: deploy
run: sudo sh install-on-linux.sh $DOMAIN # this script will install sealos and laf

- name: Run E2E Test
working-directory: e2e
run: |
sudo sh e2e.sh
10 changes: 5 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ kubernetes-local/

.kube/

deploy/build/*/manifests
deploy/build/*/registry
deploy/build/*/charts
deploy/build/registry
deploy/build-dev
build/*/manifests
build/*/registry
build/*/charts
build/registry
build-dev
docs/.vitepress/.temp
.idea/

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ laf 是开源的云开发平台,提供云函数、云数据库、云存储等

## 🎉 Self-hosted Deployment

[Deployment](./deploy/scripts/README.md)
[Deployment](./deploy/README.md)

## 🏘️ Community Groups

Expand Down
2 changes: 1 addition & 1 deletion README_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ Independent domain names and HTTPS licenses can be applied to your applications

## 🎉 Self-hosting

[self-hosting](./deploy/scripts/README.md)
[self-hosting](./deploy/README.md)

## 🏘️ Community

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit dfeed5a

Please sign in to comment.