diff --git a/.gitea/workflows/tag.yaml b/.gitea/workflows/tag.yaml new file mode 100644 index 0000000..267eb63 --- /dev/null +++ b/.gitea/workflows/tag.yaml @@ -0,0 +1,64 @@ +name: Build and Deploy on Tag +on: + push: + tags: + - 'v*' + +env: + VERSION: ${{ gitea.ref_name }} + CLWS_PACKAGE: tesses50/crosslang-withshell + CPKG_PACKAGE: tesses50/cpkg + GITEA_DOMAIN: git.tesses.org + GITEA_REGISTRY_USER: tesses50 + +jobs: + update-tap: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - run: | + cd vscode-extension + npm install + npm install -g typescript + npm install -g @@vscode/vsce + vsce package + cd .. + wget -O /usr/local/bin/crosslang https://redirect.tesses.net/cl-slim-x86_64-linux-musl + chmod 755 /usr/local/bin/crosslang + ln -s /usr/local/bin/crosslang /usr/local/bin/crossc + ln -s /usr/local/bin/crosslang /usr/local/bin/crossint + ln -s /usr/local/bin/crosslang /usr/local/bin/crossvm + crossint ./build.tcross pack + mkdir -p artifacts + cp Tesses.CrossLang.ShellPackage-*.crvm artifacts/ShellPackage.crvm + cp Tesses.CrossLang.PackageServer/bin/Tesses.CrossLang.PackageServer-*.crvm artifacts/CPKG.crvm + - name: "Publish artifacts" + uses: akkuman/gitea-release-action@v1 + env: + NODE_OPTIONS: '--experimental-fetch' # if nodejs < 18 + with: + prerelease: true + files: |- + artifacts/** + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Log in to registry + uses: docker/login-action@v3 + with: + registry: ${{ env.GITEA_DOMAIN }} + username: ${{ env.GITEA_REGISTRY_USER }} + password: ${{ secrets.PACKAGE_AND_BREW }} + - name: Build and push image + uses: docker/build-push-action@v6 + with: + context: . + file: ./Dockerfile + push: true + tags: ${{ env.GITEA_DOMAIN }}/${{ env.CLWS_PACKAGE }}:latest + - name: Build and push image + uses: docker/build-push-action@v6 + with: + context: . + file: ./Dockerfile.cpkg + push: true + tags: ${{ env.GITEA_DOMAIN }}/${{ env.CPKG_PACKAGE }}:latest \ No newline at end of file diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml index 83c0ede..f81e934 100644 --- a/.onedev-buildspec.yml +++ b/.onedev-buildspec.yml @@ -124,7 +124,7 @@ jobs: interpreter: type: DefaultInterpreter commands: | - curl "$COOLIFY_WEBHOOK" -H "Authorization: Bearer $COOLIFY_TOKEN" + curl "$COOLIFY_WEBHOOK" -H "Authorization: Bearer $COOLIFY_TOKEN" > /dev/null envVars: - name: COOLIFY_WEBHOOK value: '@secret:COOLIFY_WEBHOOK@' diff --git a/Dockerfile b/Dockerfile index 79e76fb..56a40f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM onedev.site.tesses.net/crosslang/crosslang:latest +FROM git.tesses.org/tesses50/crosslang:latest RUN crosslang update-shell \ No newline at end of file diff --git a/Dockerfile.packageserver b/Dockerfile.cpkg similarity index 82% rename from Dockerfile.packageserver rename to Dockerfile.cpkg index 98f0724..5465317 100644 --- a/Dockerfile.packageserver +++ b/Dockerfile.cpkg @@ -1,4 +1,4 @@ -FROM onedev.site.tesses.net/crosslang/crosslang:latest +FROM git.tesses.org/tesses50/crosslang:latest WORKDIR /app COPY ./Tesses.CrossLang.PackageServer/bin/Tesses.CrossLang.PackageServer-1.0.0.0-prod.crvm /app/Tesses.CrossLang.PackageServer-1.0.0.0-prod.crvm diff --git a/Tesses.CrossLang.BuildEssentials/src/sharedviewfs.tcross b/Tesses.CrossLang.BuildEssentials/src/sharedviewfs.tcross index b9edb88..ffdfc45 100644 --- a/Tesses.CrossLang.BuildEssentials/src/sharedviewfs.tcross +++ b/Tesses.CrossLang.BuildEssentials/src/sharedviewfs.tcross @@ -34,26 +34,13 @@ func New.Tesses.CrossLang.SharedViewFilesystem() return null; }, EnumeratePaths = enumeratePaths, - RegularFileExists = (path) => { + Stat = (path) => { each(var fs : fileSystems) { - if(fs.RegularFileExists(path)) return true; + const st = fs.Stat(path); + if(TypeIsDictionary(st)) return st; } - return false; - }, - FileExists = (path) => { - each(var fs : fileSystems) - { - if(fs.FileExists(path)) return true; - } - return false; - }, - DirectoryExists = (path) => { - each(var fs : fileSystems) - { - if(fs.DirectoryExists(path)) return true; - } - return false; + return null; }, AddFS = (fs)=>{ fileSystems.Add(fs); diff --git a/docker/packageserver/docker-compose.yml b/docker/packageserver/docker-compose.yml index 0d1008c..985ffd8 100644 --- a/docker/packageserver/docker-compose.yml +++ b/docker/packageserver/docker-compose.yml @@ -1,6 +1,6 @@ services: pkg: - image: onedev.site.tesses.net/crosslang/crosslangextras/packageserver:latest + image: git.tesses.org/tesses50/cpkg:latest ports: - "4206:4206" volumes: