diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f53c51b..78fb752 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -11,9 +11,6 @@ on: permissions: contents: read -env: - GOPRIVATE: github.com/upsun/lib-sun,github.com/upsun/convsun - jobs: lint: @@ -22,12 +19,8 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v4 with: - go-version: '1.22' + go-version: '1.23' check-latest: true - - name: Run config private repo - env: - TOKEN: ${{ secrets.MICK_GITHUB_TOKEN }} - run: git config --global url."https://user:${TOKEN}@github.com".insteadOf https://github.com - name: Run Go Format run: gofmt -s -w . && git diff --exit-code - name: Run Go Tidy @@ -47,10 +40,6 @@ jobs: steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v4 - - name: Run config private repo - env: - TOKEN: ${{ secrets.MICK_GITHUB_TOKEN }} - run: git config --global url."https://user:${TOKEN}@github.com".insteadOf https://github.com - name: Run tests run: go test -v -count=1 -race -shuffle=on -coverprofile=coverage.txt ./... - name: Go Benchmark @@ -82,11 +71,6 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v4 with: - go-version: '1.22' - - name: Run config private repo - env: - TOKEN: ${{ secrets.MICK_GITHUB_TOKEN }} - run: git config --global url."https://user:${TOKEN}@github.com".insteadOf https://github.com - + go-version: '1.23' - name: Build run: GOARCH=${{ matrix.goarch }} GOOS=${{ matrix.goos }} go build -v ./... diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8875a41..807e08f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,12 +24,6 @@ jobs: - uses: actions/checkout@v4 - uses: wangyoucao577/go-release-action@v1 with: - pre_command: | - echo "machine github.com login ${{ github.actor }} password ${{ secrets.MICK_GITHUB_TOKEN }}" > ~/.netrc - chmod 600 ~/.netrc - git config --global --add url."https://github.com/".insteadOf "ssh://git@github.com/" - git config --global --add url."https://github.com/".insteadOf "git@github.com" - go env -w GOPRIVATE=github.com/upsun/* github_token: ${{ secrets.GITHUB_TOKEN }} goos: ${{ matrix.goos }} goarch: ${{ matrix.goarch }} diff --git a/README.md b/README.md index 759d8c7..ec4dbda 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,18 @@ -> [!CAUTION] -> ## This project is owned by the Upsun Advocacy team. It is in early stage of development [experimental] and only intended to be used with caution by Upsun customers/community.

This project is not supported by Upsun and does not qualify for Support plans. Use this repository at your own risks, it is provided without guarantee or warranty! -> Don’t hesitate to join our [Discord](https://discord.com/invite/platformsh) to share your thoughts about this project. - - ConvSun ========= This CLI-tool uses **Platform.sh** config files *(routes.yaml, services.yaml and .platform.app.yaml(s)/applications.yaml)* to generate the **Upsun** config file *(config.yaml)* -> **WARNING : This tool handles classic 'multi-app...' cases but has not been tested for snowflack cases.** + +> [!CAUTION] +> **This project is owned by the Upsun Advocacy team. It is in early stage of development [experimental] and only intended to be used with caution by Upsun customers/community.

This project is not supported by Upsun and does not qualify for Support plans. Use this repository at your own risks, it is provided without guarantee or warranty!** +> Don’t hesitate to join our [Discord](https://discord.gg/upsun) to share your thoughts about this project. + +> **WARNING: This tool handles classic 'multi-app...' cases but has not been tested for snowflake cases.** #### Install Download the last binary in [release section](https://github.com/upsun/convsun/releases). -Extract it and enjoy ! +Extract it and enjoy! #### Syntax ``` @@ -24,4 +24,4 @@ Usage of convsun: ``` #### Sample -`$ upsun_convert --src=tests/convert"` +`$ convsun --src=tests/convert"` diff --git a/go.mod b/go.mod index dd116a4..9492b92 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ module github.com/upsun/convsun -go 1.22.6 +go 1.23.5 require ( github.com/spf13/pflag v1.0.5 - github.com/upsun/lib-sun v0.3.13 + github.com/upsun/lib-sun v0.3.14 ) require ( diff --git a/go.sum b/go.sum index 4f100c7..7b0f1c8 100644 --- a/go.sum +++ b/go.sum @@ -16,8 +16,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/upsun/lib-sun v0.3.13 h1:gB40P4XBeu/sMrEGASCZ+vuf1m4Xy13ndAGAPECy/Tw= -github.com/upsun/lib-sun v0.3.13/go.mod h1:8AtRNv0L+c9qCS/maO/OVFIn2VDi89LTkWwpB7YKTDE= +github.com/upsun/lib-sun v0.3.14 h1:qD36j2bPMbGMmDH7Gu8lI8KZtTt+HnmeO/O/kRZ08ec= +github.com/upsun/lib-sun v0.3.14/go.mod h1:8AtRNv0L+c9qCS/maO/OVFIn2VDi89LTkWwpB7YKTDE= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=