Skip to content

Commit

Permalink
hof/chore: update a number of versions (#275)
Browse files Browse the repository at this point in the history
  • Loading branch information
verdverm authored Aug 25, 2023
1 parent cfa1c85 commit 0cb49ca
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 22 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/dagger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: dagger
- push
env:
HOF_TELEMETRY_DISABLED: "1"
HOF_FMT_VERSION: v0.6.8-rc.5
HOF_FMT_VERSION: v0.6.8
jobs:
inception:
runs-on: ubuntu-latest
Expand All @@ -14,7 +14,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: 1.20.x
go-version: 1.21.x
- uses: actions/cache@v3
with:
path: |-
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: 1.20.x
go-version: 1.21.x
- uses: actions/cache@v3
with:
path: |-
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:
- run: |-
mkdir tmp
cd tmp
wget https://github.com/cue-lang/cue/releases/download/v0.5.0-beta.5/cue_v0.5.0-beta.5_linux_amd64.tar.gz -O cue.tar.gz
wget https://github.com/cue-lang/cue/releases/download/v0.6.0/cue_v0.6.0_linux_amd64.tar.gz -O cue.tar.gz
tar -xf cue.tar.gz
sudo mv cue /usr/local/bin/cue
cd ../
rm -rf tmp
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: 1.20.x
go-version: 1.21.x
- uses: actions/cache@v3
with:
path: |-
Expand Down Expand Up @@ -50,14 +50,14 @@ jobs:
run: go install ./cmd/hof
- name: Setup
run: |-
hof fmt start [email protected]-beta.12
hof fmt start [email protected]
cd docs
hof mod link
make tools
make deps
- name: Test
run: |-
hof fmt start [email protected]-rc.5
hof fmt start [email protected]
cd docs
make gen
make test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hof.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
fail-fast: false
matrix:
go:
- 1.19.x
- 1.20.x
- 1.21.x
os:
- ubuntu-latest
- macos-latest
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ jobs:
- run: |-
mkdir tmp
cd tmp
wget https://github.com/cue-lang/cue/releases/download/v0.5.0-beta.5/cue_v0.5.0-beta.5_linux_amd64.tar.gz -O cue.tar.gz
wget https://github.com/cue-lang/cue/releases/download/v0.6.0/cue_v0.6.0_linux_amd64.tar.gz -O cue.tar.gz
tar -xf cue.tar.gz
sudo mv cue /usr/local/bin/cue
cd ../
rm -rf tmp
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: 1.20.x
go-version: 1.21.x
- uses: actions/cache@v3
with:
path: |-
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
run: go install ./cmd/hof
- name: Setup
run: |-
hof fmt start [email protected]-beta.12
hof fmt start [email protected]
cd docs
hof mod link
make tools
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: 1.20.x
go-version: 1.21.x
- name: Fetch Go deps
run: go mod download
- name: Run GoReleaser
Expand Down
4 changes: 2 additions & 2 deletions ci/gha/common/steps.cue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Steps: {

cue: {
install: {
#ver: string | *"v0.5.0-beta.5"
#ver: string | *"v0.6.0"
run: """
mkdir tmp
cd tmp
Expand Down Expand Up @@ -206,7 +206,7 @@ Steps: {
setup: {
name: "Setup"
run: """
hof fmt start [email protected]-beta.12
hof fmt start [email protected]
cd docs
hof mod link
make tools
Expand Down
4 changes: 2 additions & 2 deletions ci/gha/common/vars.cue
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ Formatters: [

Versions: {
docker: "23.0.1"
go: "1.20.x" | ["1.19.x", "1.20.x"]
os: "ubuntu-latest" | ["ubuntu-latest", "macos-latest"]
go: "1.21.x" | ["1.20.x", "1.21.x"]
os: "ubuntu-latest" | ["ubuntu-latest", "macos-latest"]
}
4 changes: 2 additions & 2 deletions ci/gha/dagger.cue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ghacue.#Workflow & {
on: _ | *["push"]
env: {
HOF_TELEMETRY_DISABLED: "1"
HOF_FMT_VERSION: "v0.6.8-rc.5"
HOF_FMT_VERSION: "v0.6.8"
}
jobs: {
inception: {
Expand All @@ -21,7 +21,7 @@ ghacue.#Workflow & {
}

steps: [
common.Steps.go.setup & {#ver: "1.20.x"},
common.Steps.go.setup & {#ver: "1.21.x"},
common.Steps.go.cache,
common.Steps.checkout,
common.Steps.vars,
Expand Down
2 changes: 1 addition & 1 deletion ci/gha/docs.cue
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ ghacue.#Workflow & {
{
name: "Test"
run: """
hof fmt start [email protected]-rc.5
hof fmt start [email protected]
cd docs
make gen
make test
Expand Down
2 changes: 1 addition & 1 deletion ci/harmony/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func init() {

pflag.StringVar(&R.HofVer, "hof", "local", "set Hof version")
pflag.StringVar(&R.CueVer, "cue", "v0.6.0", "set CUE version")
pflag.StringVar(&R.GoVer, "go", "1.20", "set Go version")
pflag.StringVar(&R.GoVer, "go", "1.21", "set Go version")
pflag.StringVar(&R.ContainerRuntime, "container-runtime", "docker", "set container runtime")
pflag.StringVar(&R.ContainerVersion, "container-version", "24", "set container version")
pflag.StringVar(&R.RunGroup, "group", "", "run tests where the group name has this flag as a prefix")
Expand Down
2 changes: 1 addition & 1 deletion docs/hack/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -eou pipefail

HUGO_VER="0.111.3"
CUE_VER="v0.5.0-beta.5"
CUE_VER="v0.6.0"

mkdir tmp
pushd tmp
Expand Down
2 changes: 1 addition & 1 deletion test/dagger/hof.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ type Runtime struct {
Client *dagger.Client
}

var goVer = "golang:1.20"
var goVer = "golang:1.21"

func (R *Runtime) GolangImage(platform string) (*dagger.Container) {
c := R.Client.
Expand Down

0 comments on commit 0cb49ca

Please sign in to comment.