feat: Merge the code currently scattered across the beclab and Above-os organizations into the https://github.com/beclab/Olares repository. (#1325)

* feat: refactor

* refactor apps folder

* feat: add vendor folder

* refactor: package scripts

---------

Co-authored-by: eball <liuy102@hotmail.com>
This commit is contained in:
Peng Peng 2025-05-21 21:43:35 +08:00 committed by GitHub
parent 693d32bc2e
commit 79372a32af
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
451 changed files with 731 additions and 987 deletions

View file

@ -17,4 +17,4 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: "us-east-1"
run: |
bash scripts/build-redis.sh linux/amd64 glibc-231
bash build/build-redis.sh linux/amd64 glibc-231

View file

@ -17,7 +17,7 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: "us-east-1"
run: |
bash scripts/build-redis.sh linux/amd64
bash build/build-redis.sh linux/amd64
push-arm64:
runs-on: [self-hosted, linux, ARM64]
@ -40,4 +40,4 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: "us-east-1"
run: |
sudo -E sh -c "bash scripts/build-redis.sh linux/arm64 && rm -rf redis*"
sudo -E sh -c "bash build/build-redis.sh linux/arm64 && rm -rf redis*"

View file

@ -17,4 +17,4 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: "us-east-1"
run: |
bash scripts/build-ubuntu2204.sh
bash build/build-ubuntu2204.sh

View file

@ -17,4 +17,4 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: "us-east-1"
run: |
bash scripts/build-wsl-install-msi.sh
bash build/build-wsl-install-msi.sh

View file

@ -35,7 +35,7 @@ jobs:
- name: Pre package
run: |
bash scripts/package.sh
bash build/package.sh
- name: Run chart-testing (lint)
run: ct lint --chart-dirs build/installer/wizard/config,build/installer/wizard/config/apps,build/installer/wizard/config/gpu --check-version-increment=false --all
@ -65,7 +65,7 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: "us-east-1"
run: |
bash scripts/image-manifest.sh && bash scripts/upload-images.sh .manifest/images.mf
bash build/image-manifest.sh && bash build/upload-images.sh .manifest/images.mf
push-image-arm64:
runs-on: [self-hosted, linux, ARM64]
@ -85,7 +85,7 @@ jobs:
AWS_DEFAULT_REGION: 'us-east-1'
run: |
export PATH=$PATH:/usr/local/bin:/home/ubuntu/.local/bin
bash scripts/image-manifest.sh && bash scripts/upload-images.sh .manifest/images.mf linux/arm64
bash build/image-manifest.sh && bash build/upload-images.sh .manifest/images.mf linux/arm64
push-deps:
@ -105,7 +105,7 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: "us-east-1"
run: |
bash scripts/deps-manifest.sh && bash scripts/upload-deps.sh
bash build/deps-manifest.sh && bash build/upload-deps.sh
push-deps-arm64:
runs-on: [self-hosted, linux, ARM64]
@ -128,7 +128,7 @@ jobs:
AWS_DEFAULT_REGION: "us-east-1"
run: |
export PATH=$PATH:/usr/local/bin:/home/ubuntu/.local/bin
bash scripts/deps-manifest.sh linux/arm64 && bash scripts/upload-deps.sh linux/arm64
bash build/deps-manifest.sh linux/arm64 && bash build/upload-deps.sh linux/arm64
@ -151,7 +151,7 @@ jobs:
- name: Package installer
run: |
bash scripts/build.sh ${{ steps.vars.outputs.tag_version }}
bash build/build.sh ${{ steps.vars.outputs.tag_version }}
- name: Upload package
env:

View file

@ -29,7 +29,7 @@ jobs:
- name: Pre package
run: |
bash scripts/package.sh
bash build/package.sh
- name: Run chart-testing (lint)
run: |

View file

@ -33,7 +33,7 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: "us-east-1"
run: |
bash scripts/deps-manifest.sh && bash scripts/upload-deps.sh
bash build/deps-manifest.sh && bash build/upload-deps.sh
push-arm64:
runs-on: [self-hosted, linux, ARM64]
@ -66,4 +66,4 @@ jobs:
AWS_DEFAULT_REGION: "us-east-1"
run: |
export PATH=$PATH:/usr/local/bin:/home/ubuntu/.local/bin
bash scripts/deps-manifest.sh linux/arm64 && bash scripts/upload-deps.sh linux/arm64
bash build/deps-manifest.sh linux/arm64 && bash build/upload-deps.sh linux/arm64

View file

@ -33,7 +33,7 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: "us-east-1"
run: |
bash scripts/image-manifest.sh && bash scripts/upload-images.sh .manifest/images.mf
bash build/image-manifest.sh && bash build/upload-images.sh .manifest/images.mf
push-arm64:
runs-on: [self-hosted, linux, ARM64]
@ -65,4 +65,4 @@ jobs:
AWS_DEFAULT_REGION: "us-east-1"
run: |
export PATH=$PATH:/usr/local/bin:/home/ubuntu/.local/bin
bash scripts/image-manifest.sh && bash scripts/upload-images.sh .manifest/images.mf linux/arm64
bash build/image-manifest.sh && bash build/upload-images.sh .manifest/images.mf linux/arm64

View file

@ -21,7 +21,7 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: 'us-east-1'
run: |
bash scripts/image-manifest.sh && bash scripts/upload-images.sh .manifest/images.mf
bash build/image-manifest.sh && bash build/upload-images.sh .manifest/images.mf
push-images-arm64:
runs-on: [self-hosted, linux, ARM64]
@ -36,7 +36,7 @@ jobs:
AWS_DEFAULT_REGION: 'us-east-1'
run: |
export PATH=$PATH:/usr/local/bin:/home/ubuntu/.local/bin
bash scripts/image-manifest.sh && bash scripts/upload-images.sh .manifest/images.mf linux/arm64
bash build/image-manifest.sh && bash build/upload-images.sh .manifest/images.mf linux/arm64
push-deps:
runs-on: ubuntu-latest
@ -51,7 +51,7 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: "us-east-1"
run: |
bash scripts/deps-manifest.sh && bash scripts/upload-deps.sh
bash build/deps-manifest.sh && bash build/upload-deps.sh
push-deps-arm64:
runs-on: [self-hosted, linux, ARM64]
@ -67,7 +67,7 @@ jobs:
AWS_DEFAULT_REGION: "us-east-1"
run: |
export PATH=$PATH:/usr/local/bin:/home/ubuntu/.local/bin
bash scripts/deps-manifest.sh linux/arm64 && bash scripts/upload-deps.sh linux/arm64
bash build/deps-manifest.sh linux/arm64 && bash build/upload-deps.sh linux/arm64
upload-package:
@ -86,7 +86,7 @@ jobs:
- name: Package installer
run: |
bash scripts/build.sh ${{ steps.vars.outputs.tag_version }}
bash build/build.sh ${{ steps.vars.outputs.tag_version }}
- name: Upload to S3
env:
@ -123,7 +123,7 @@ jobs:
- name: Package installer
run: |
bash scripts/build.sh ${{ steps.vars.outputs.tag_version }}
bash build/build.sh ${{ steps.vars.outputs.tag_version }}
- name: 'Archives'
run: |

View file

@ -23,7 +23,7 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: 'us-east-1'
run: |
bash scripts/image-manifest.sh && bash scripts/upload-images.sh .manifest/images.mf
bash build/image-manifest.sh && bash build/upload-images.sh .manifest/images.mf
push-arm64:
runs-on: [self-hosted, linux, ARM64]
@ -40,7 +40,7 @@ jobs:
AWS_DEFAULT_REGION: 'us-east-1'
run: |
export PATH=$PATH:/usr/local/bin:/home/ubuntu/.local/bin
bash scripts/image-manifest.sh && bash scripts/upload-images.sh .manifest/images.mf linux/arm64
bash build/image-manifest.sh && bash build/upload-images.sh .manifest/images.mf linux/arm64
upload-package:
needs: [push, push-arm64]
@ -54,7 +54,7 @@ jobs:
- name: Package installer
run: |
bash scripts/build.sh ${{ github.event.inputs.tags }}
bash build/build.sh ${{ github.event.inputs.tags }}
- name: Upload to S3
env:
@ -95,7 +95,7 @@ jobs:
- name: Package installer
run: |
bash scripts/build.sh ${{ github.event.inputs.tags }}
bash build/build.sh ${{ github.event.inputs.tags }}
- name: 'Archives'
run: |

1
.gitignore vendored
View file

@ -23,6 +23,7 @@ go.work
.dist
.manifest
.dependencies
install-wizard-*.tar.gz
olares-cli-*.tar.gz
!ks-console-*.tgz

View file

Before

Width:  |  Height:  |  Size: 749 KiB

After

Width:  |  Height:  |  Size: 749 KiB

View file

@ -1,2 +0,0 @@
# RSS Recommend

View file

@ -1,3 +0,0 @@
# desktop
https://github.com/beclab/desktop

View file

@ -1,3 +0,0 @@
# files
https://github.com/beclab/files

View file

@ -1,3 +0,0 @@
# market-server
https://github.com/beclab/market-server

View file

@ -1,3 +0,0 @@
# Market (app store)
https://github.com/beclab/market

View file

@ -1,3 +0,0 @@
# vault
https://github.com/beclab/analytic

View file

@ -1,3 +0,0 @@
# search
https://github.com/beclab/dify-gateway

View file

@ -1,4 +0,0 @@
# devbox
Terminus App development management tools
https://github.com/beclab/devbox

View file

@ -1,5 +0,0 @@
# system-apps
dashboard control-hub
https://github.com/beclab/system-apps

View file

@ -1,3 +0,0 @@
# TermiPass
https://github.com/beclab/TermiPass

View file

@ -1,3 +0,0 @@
# wizard
https://github.com/beclab/wizard

Some files were not shown because too many files have changed in this diff Show more