From 886ae9ddcb6d6596e06dfdce6381d23d407fa276 Mon Sep 17 00:00:00 2001 From: Sarah Roberts Date: Thu, 28 Mar 2024 17:50:25 -0700 Subject: [PATCH] DD-18: switched to the shared GitHub workflows --- .github/workflows/build-prerelease.yml | 24 ------------- .github/workflows/build-release.yml | 23 ------------ .github/workflows/go-build.yml | 15 ++++++++ .github/workflows/golangci-lint.yml | 50 +++----------------------- 4 files changed, 19 insertions(+), 93 deletions(-) delete mode 100644 .github/workflows/build-prerelease.yml delete mode 100644 .github/workflows/build-release.yml create mode 100644 .github/workflows/go-build.yml diff --git a/.github/workflows/build-prerelease.yml b/.github/workflows/build-prerelease.yml deleted file mode 100644 index 659b5d7..0000000 --- a/.github/workflows/build-prerelease.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: skaffold-build-prerelease -on: - push: - tags: - - "v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+" -jobs: - pipeline: - name: Skaffold Docker build - runs-on: ubuntu-20.04 - steps: - - name: Checkout Repo - id: checkout - uses: actions/checkout@v3 - - name: Set up Go Tools - uses: actions/setup-go@v4 - with: - go-version: '>=1.21.0' - - name: Build Executable - run: | - go build . - - uses: ncipollo/release-action@v1 - with: - artifacts: "condor-launcher" - prerelease: true diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml deleted file mode 100644 index f46ca41..0000000 --- a/.github/workflows/build-release.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: skaffold-build-release -on: - push: - tags: - - "v[0-9]+.[0-9]+.[0-9]+" -jobs: - pipeline: - name: Skaffold Docker build - runs-on: ubuntu-20.04 - steps: - - name: Checkout Repo - id: checkout - uses: actions/checkout@v3 - - name: Set up Go Tools - uses: actions/setup-go@v4 - with: - go-version: '>=1.21.0' - - name: Build Executable - run: | - go build . - - uses: ncipollo/release-action@v1 - with: - artifacts: "condor-launcher" diff --git a/.github/workflows/go-build.yml b/.github/workflows/go-build.yml new file mode 100644 index 0000000..15bf3aa --- /dev/null +++ b/.github/workflows/go-build.yml @@ -0,0 +1,15 @@ +name: go-build + +on: + push: + tags: + - "v[0-9]+.[0-9]+.[0-9]+" + - "v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+" + +jobs: + call-workflow-passing-data: + uses: cyverse-de/github-workflows/.github/workflows/go-build.yml@v0.0.10 + with: + build-prerelease: ${{ contains(github.ref_name, '-rc') }} + secrets: + releases-repo-push-token: ${{ secrets.GH_DE_RELEASES_PUSH_TOKEN }} diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index d2af3ec..af402e3 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -6,50 +6,8 @@ on: - main pull_request: -permissions: - contents: read - # Optional: allow read access to pull request. Use with `only-new-issues` option. - # pull-requests: read - jobs: - golangci: - name: lint - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v4 - with: - go-version: '1.19' - cache: false - - name: golangci-lint - uses: golangci/golangci-lint-action@v3 - with: - # Require: The version of golangci-lint to use. - # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version. - # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit. - version: v1.53 - - # Optional: working directory, useful for monorepos - # working-directory: somedir - - # Optional: golangci-lint command line arguments. - # - # Note: by default the `.golangci.yml` file should be at the root of the repository. - # The location of the configuration file can be changed by using `--config=` - # args: --timeout=30m --config=/my/path/.golangci.yml --issues-exit-code=0 - - # Optional: show only new issues if it's a pull request. The default value is `false`. - # only-new-issues: true - - # Optional: if set to true then the all caching functionality will be complete disabled, - # takes precedence over all other caching options. - # skip-cache: true - - # Optional: if set to true then the action don't cache or restore ~/go/pkg. - # skip-pkg-cache: true - - # Optional: if set to true then the action don't cache or restore ~/.cache/go-build. - # skip-build-cache: true - - # Optional:The mode to install golangci-lint. It can be 'binary' or 'goinstall'. - # install-mode: "goinstall" + call-workflow-passing-data: + uses: cyverse-de/github-workflows/.github/workflows/golangci-lint.yml@v0.0.10 + with: + go-version: 1.21