Skip to content

Commit 3422ae6

Browse files
feat(ci): adjust for fork (#3)
Modifies to CI to publish on branch `coreweave` with commit hash.
1 parent 991c9fb commit 3422ae6

File tree

5 files changed

+60
-26
lines changed

5 files changed

+60
-26
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/ci.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
name: ci
22
on:
3+
workflow_dispatch: {}
34
push:
45
branches:
5-
- master
6-
pull_request:
7-
branches:
8-
- master
6+
- "coreweave"
97
jobs:
108
build:
119
strategy:
@@ -45,7 +43,7 @@ jobs:
4543
runs-on: ${{ matrix.os }}-latest
4644
services:
4745
minio:
48-
image: ${{ (matrix.os == 'ubuntu') && 'bitnami/minio:2023.7.18' || ''}}
46+
image: ${{ (matrix.os == 'ubuntu') && 'bitnamilegacy/minio:2023.7.18' || ''}}
4947
ports:
5048
- 45677:9000
5149
options: >-

.github/workflows/docker.yml

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,42 @@
11
name: docker
22
on:
3-
release:
4-
types: [published]
3+
workflow_dispatch: {}
4+
push:
5+
branches:
6+
- "coreweave"
57
jobs:
68
multi:
79
runs-on: ubuntu-latest
810
steps:
911
-
1012
name: Checkout
1113
uses: actions/checkout@v2
14+
with:
15+
fetch-depth: 0
1216
-
1317
name: Set up QEMU
1418
uses: docker/setup-qemu-action@v1
1519
-
1620
name: Set up Docker Buildx
1721
uses: docker/setup-buildx-action@v1
1822
-
19-
name: Login to DockerHub
20-
uses: docker/login-action@v1
23+
name: Log into registry ghcr.io
24+
uses: docker/login-action@v3.3.0
2125
with:
22-
username: ${{ secrets.DOCKER_USERNAME }}
23-
password: ${{ secrets.DOCKER_TOKEN }}
26+
registry: ghcr.io
27+
username: ${{ github.actor }}
28+
password: ${{ secrets.GITHUB_TOKEN }}
29+
-
30+
name: Get tag
31+
id: get_tag
32+
run: |
33+
git remote add upstream https://github.com/peak/s5cmd.git
34+
git fetch --tags upstream
35+
VERSION=$(git describe --tags --exclude '*-' --abbrev=0)
36+
echo "VERSION=$VERSION" >> $GITHUB_ENV
37+
echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
38+
echo "version=$VERSION" >> $GITHUB_OUTPUT
39+
echo "short_sha=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_OUTPUT
2440
-
2541
name: Build and push
2642
uses: docker/build-push-action@v2
@@ -30,5 +46,6 @@ jobs:
3046
push: true
3147
platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/arm/v6,linux/arm/v7,linux/386
3248
tags: |
33-
peakcom/s5cmd:latest
34-
peakcom/s5cmd:${{ github.event.release.tag_name }}
49+
ghcr.io/coreweave/s5cmd:latest
50+
ghcr.io/coreweave/s5cmd:${{ steps.get_tag.outputs.version }}-${{ steps.get_tag.outputs.short_sha }}
51+

.github/workflows/goreleaser.yml

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
name: goreleaser
22
on:
3+
workflow_dispatch: {}
34
push:
4-
tags:
5-
- 'v*'
5+
branches:
6+
- "coreweave"
67
jobs:
7-
gcs_test:
8-
name: gcs-test
8+
caios_test:
9+
name: caios-test
910
runs-on: ubuntu-latest
1011
steps:
1112
- uses: actions/checkout@v2
@@ -14,16 +15,19 @@ jobs:
1415
go-version: 1.22.x
1516
- run: make test_without_race
1617
env:
17-
S5CMD_ACCESS_KEY_ID: ${{ secrets.S5CMD_GCS_ACCESS_KEY_ID }}
18-
S5CMD_SECRET_ACCESS_KEY: ${{ secrets.S5CMD_GCS_SECRET_ACCESS_KEY }}
19-
S5CMD_ENDPOINT_URL: https://storage.googleapis.com
18+
S5CMD_ACCESS_KEY_ID: ${{ secrets.S5CMD_CAIOS_ACCESS_KEY_ID }}
19+
S5CMD_SECRET_ACCESS_KEY: ${{ secrets.S5CMD_CAIOS_SECRET_ACCESS_KEY }}
20+
S5CMD_ENDPOINT_URL: https://cwobject.com
2021
S5CMD_IS_VIRTUAL_HOST: 1
21-
S5CMD_REGION: ${{ secrets.S5CMD_GCS_REGION }}
22+
S5CMD_REGION: ${{ secrets.S5CMD_CAIOS_REGION }}
2223
S5CMD_I_KNOW_WHAT_IM_DOING: 1
2324

2425
goreleaser:
25-
needs: [ gcs_test ]
26+
needs: [ caios_test ]
2627
runs-on: ubuntu-latest
28+
permissions:
29+
contents: write
30+
packages: write
2731
steps:
2832
-
2933
name: Checkout
@@ -35,11 +39,25 @@ jobs:
3539
uses: actions/setup-go@v2
3640
with:
3741
go-version: '1.22'
42+
43+
- name: Get tag
44+
id: get_tag
45+
run: |
46+
git remote add upstream https://github.com/peak/s5cmd.git
47+
git fetch --tags upstream
48+
VERSION=$(git describe --tags --exclude '*-' --abbrev=0)
49+
echo "VERSION=$VERSION" >> $GITHUB_ENV
50+
echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
51+
echo "version=$VERSION" >> $GITHUB_OUTPUT
52+
echo "short_sha=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_OUTPUT
53+
3854
-
3955
name: Run GoReleaser
4056
uses: goreleaser/goreleaser-action@v2
4157
with:
4258
version: '1.18.2'
4359
args: release --rm-dist
4460
env:
45-
GITHUB_TOKEN: ${{ secrets.GORELEASER_TOKEN }}
61+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
62+
GORELEASER_CURRENT_TAG: ${{ steps.get_tag.outputs.version }}-${{ steps.get_tag.outputs.short_sha }}
63+

.goreleaser.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/goreleaser/goreleaser/v1.18.2/www/docs/static/schema.json
2+
13
before:
24
hooks:
35
- make build
46
builds:
57
-
68
binary: s5cmd
7-
ldflags: -s -w -X github.com/peak/s5cmd/v2/version.Version={{.Tag}} -X github.com/peak/s5cmd/v2/version.GitCommit={{ .ShortCommit }}
9+
ldflags: -s -w -X github.com/coreweave/s5cmd/v2/version.Version={{.Tag}} -X github.com/coreweave/s5cmd/v2/version.GitCommit={{ .ShortCommit }}
810
env:
911
- CGO_ENABLED=0
1012
goos:
@@ -37,7 +39,7 @@ checksum:
3739
name_template: '{{ .ProjectName }}_checksums.txt'
3840

3941
snapshot:
40-
name_template: "{{ .Tag }}"
42+
name_template: "{{ .Tag }}-{{ .ShortCommit }}"
4143

4244
changelog:
4345
sort: asc

0 commit comments

Comments
 (0)