From 75ebc60d8a7bdf3e497f4dc5a2261e0b49a7b909 Mon Sep 17 00:00:00 2001 From: Vincent Boutour Date: Sat, 13 Apr 2024 00:54:44 +0200 Subject: [PATCH] chore: Renaming scripts being imported Signed-off-by: Vincent Boutour --- .github/workflows/branch_clean.yaml | 4 ++-- .github/workflows/build.yaml | 10 +++++----- .github/workflows/release.yaml | 8 ++++---- Makefile | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/branch_clean.yaml b/.github/workflows/branch_clean.yaml index 5baab2ad..b22e48c8 100644 --- a/.github/workflows/branch_clean.yaml +++ b/.github/workflows/branch_clean.yaml @@ -36,5 +36,5 @@ jobs: BASE: origin/${{ github.base_ref }} HEAD: HEAD run: | - curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap" | bash -s -- "-c" "git_branch_clean" - scripts/git_branch_clean "${BASE}" "${HEAD}" + curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap.sh" | bash -s -- "-c" "git_branch_clean.sh" + scripts/git_branch_clean.sh "${BASE}" "${HEAD}" diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a84ddab3..c1ffc436 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -61,9 +61,9 @@ jobs: env: GO_ARCHS: linux/amd64 linux/arm linux/arm64 darwin/amd64 darwin/arm64 run: | - curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap" | bash -s -- "-c" "release" + curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap.sh" | bash -s -- "-c" "release.sh" curl --disable --silent --show-error --location --max-time 30 -o mime.types "https://svn.apache.org/viewvc/httpd/httpd/trunk/docs/conf/mime.types?view=co" - ./scripts/release build + ./scripts/release.sh build - name: Setup Docker uses: docker/setup-buildx-action@v3 - name: Setup DockerHub @@ -81,7 +81,7 @@ jobs: DOCKER_USER: ${{ secrets.DOCKER_USER }} DOCKER_PASS: ${{ secrets.DOCKER_PASS }} run: | - RELEASE_NEED_WAIT=true DOCKER_IMAGE="${{ secrets.DOCKER_USER }}/$(make name)" IMAGE_VERSION="$(make version)" GIT_SHA="$(make version-full)" ./scripts/release docker + RELEASE_NEED_WAIT=true DOCKER_IMAGE="${{ secrets.DOCKER_USER }}/$(make name)" IMAGE_VERSION="$(make version)" GIT_SHA="$(make version-full)" ./scripts/release.sh docker publish: name: Publish @@ -96,8 +96,8 @@ jobs: DOCKER_USER: ${{ secrets.DOCKER_USER }} DOCKER_PASS: ${{ secrets.DOCKER_PASS }} run: | - curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap" | bash -s -- "-c" "docker_promote" - scripts/docker_promote -d "$(make version-date)" "${{ secrets.DOCKER_USER }}/$(make name)" "$(make version)" + curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap.sh" | bash -s -- "-c" "docker_promote.sh" + scripts/docker_promote.sh -d "$(make version-date)" "${{ secrets.DOCKER_USER }}/$(make name)" "$(make version)" - name: Flux env: FLUX_TOKEN: ${{ secrets.FLUX_TOKEN }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b9cf6e38..0351e8e3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -53,14 +53,14 @@ jobs: GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }} GO_ARCHS: linux/amd64 linux/arm linux/arm64 darwin/amd64 darwin/arm64 run: | - curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap" | bash -s -- "-c" "release" + curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap.sh" | bash -s -- "-c" "release.sh" export GIT_TAG="$(basename ${{ github.ref }})" - scripts/release build assets clean + scripts/release.sh build assets clean - name: Docker if: ${{ env.docker_user != '' }} env: DOCKER_USER: ${{ env.docker_user }} DOCKER_PASS: ${{ secrets.DOCKER_PASS }} run: | - curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap" | bash -s -- "-c" "docker_promote" - scripts/docker_promote "${{ env.DOCKER_USER }}/$(make name)" "$(make version-date)" "$(basename ${{ github.ref }})" + curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap.sh" | bash -s -- "-c" "docker_promote.sh" + scripts/docker_promote.sh "${{ env.DOCKER_USER }}/$(make name)" "$(make version-date)" "$(basename ${{ github.ref }})" diff --git a/Makefile b/Makefile index 84c0f0f6..4c778659 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ app: init dev ## init: Bootstrap your application. e.g. fetch some data files, make some API calls, request user input etc... .PHONY: init init: - @curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap" | bash -s -- "-c" "git_hooks" "coverage" "release" + @curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap.sh" | bash -s -- "-c" "git_hooks" "coverage.sh" go install "github.com/golangci/golangci-lint/cmd/golangci-lint@latest" go install "golang.org/x/tools/cmd/goimports@latest" go install "golang.org/x/tools/go/analysis/passes/fieldalignment/cmd/fieldalignment@master" @@ -81,7 +81,7 @@ mocks: ## test: Shortcut to launch all the test tasks (unit, functional and integration). .PHONY: test test: - scripts/coverage + scripts/coverage.sh $(MAKE) bench ## bench: Shortcut to launch benchmark tests.