Skip to content

Commit

Permalink
Merge pull request ceph#2 from ceph/main
Browse files Browse the repository at this point in the history
sync downstream with upstream main
  • Loading branch information
openshift-merge-bot[bot] authored Jul 2, 2024
2 parents dd411d5 + ad21ad0 commit 3609a3e
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 13 deletions.
28 changes: 28 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: build
on:
pull_request:
branches:
- main
- release-*

# cancel the in-progress workflow when PR is refreshed.
concurrency:
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
cancel-in-progress: true

permissions:
contents: read

jobs:
build:
name: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 1
- uses: actions/setup-go@v5
with:
go-version-file: go.mod
- name: run make build
run: make build
16 changes: 4 additions & 12 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
name: lint
on:
push:
paths-ignore:
- 'vendor/*'
tags:
- v*
branches:
- main
- release-*
pull_request:
paths-ignore:
- 'vendor/*'
Expand All @@ -30,7 +22,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-depth: 1
- name: codespell
uses: codespell-project/actions-codespell@master
with:
Expand All @@ -44,7 +36,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-depth: 1
- name: misspell
uses: reviewdog/action-misspell@v1

Expand All @@ -54,7 +46,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-depth: 1
- uses: actions/setup-go@v5
with:
go-version-file: go.mod
Expand All @@ -76,7 +68,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-depth: 1
- uses: actions/setup-go@v5
with:
go-version-file: go.mod
Expand Down
8 changes: 7 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Image URL to use all building/pushing image targets
IMG ?= controller:latest
IMAGE_REGISTRY ?= quay.io
REGISTRY_NAMESPACE ?= cephcsi
IMAGE_TAG ?= latest
IMAGE_NAME ?= ceph-csi-operator

IMG ?= $(IMAGE_REGISTRY)/$(REGISTRY_NAMESPACE)/$(IMAGE_NAME):$(IMAGE_TAG)

# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.29.0

Expand Down

0 comments on commit 3609a3e

Please sign in to comment.