diff --git a/.github/workflows/actions-sync-e2e-test-caller.yml b/.github/workflows/actions-sync-e2e-test-caller.yml index cb27ef0..85c4356 100644 --- a/.github/workflows/actions-sync-e2e-test-caller.yml +++ b/.github/workflows/actions-sync-e2e-test-caller.yml @@ -8,7 +8,13 @@ jobs: strategy: fail-fast: false matrix: - runson: [ubuntu-latest, macos-latest, windows-latest] + runson: [ + ubuntu-latest, + ubuntu-20.04, + macos-latest, + windows-latest, + windows-2019 + ] uses: ./.github/workflows/actions-sync-e2e-test-called.yml with: runson: ${{ matrix.runson }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a9526e..f8b86e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,13 +4,23 @@ on: workflow_dispatch: jobs: CI: - runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu-20.04, ubuntu-latest] + runs-on: ${{ matrix.os }} steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Lint - run: docker-compose run --rm lint - - name: Test - run: docker-compose run --rm test - - name: E2E - run: docker-compose run --rm test-build + - name: Checkout + uses: actions/checkout@v4 + - name: Setup Go + uses: actions/setup-go@v5 + with: + go-version: 1.21 + - name: Lint + uses: golangci/golangci-lint-action@v4 + with: + version: v1.57.2 + args: run + - name: Unit Tests + run: .script/test + - name: Build and Test + run: ./script/test-build diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index 5b4e08f..9f09d2d 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -18,7 +18,7 @@ jobs: - name: Set CURRENT_TAG run: echo "GORELEASER_CURRENT_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV - name: Run GoReleaser - uses: goreleaser/goreleaser-action@f09f1a7bee7ae6b5153daf4e8c63cc8ce8c7e7d5 + uses: goreleaser/goreleaser-action@v5 with: version: latest args: release --clean diff --git a/.goreleaser.yml b/.goreleaser.yml index 7f6b6b9..ebe2090 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,16 +1,24 @@ -project_name: gh - +project_name: actions/actions-sync builds: - - <<: &build_defaults - binary: bin/actions-sync - id: macos - goos: [darwin] - goarch: [amd64, arm64] - - <<: *build_defaults - id: linux - goos: [linux] - goarch: [amd64, arm64] - - <<: *build_defaults - id: windows - goos: [windows] - goarch: [amd64] + - id: build + goos: + - linux + - darwin + - windows + goarch: + - amd64 + - arm64 + binary: bin/actions-sync + ignore: + - goos: windows + goarch: arm64 + env: + - CGO_ENABLED=0 +release: + github: + owner: actions + name: actions-sync + # Create the release as a draft so it can be tested before being published + # To test, go to the Actions tab and run the "Actions Sync E2E Sanity Test" workflow + draft: true + diff --git a/docker-compose.yml b/docker-compose.yml index 67babab..2d1e1d1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,23 +1,23 @@ -version: "3.5" -services: - lint: - image: lint - build: - context: . - dockerfile: Dockerfile.cibuild - entrypoint: - - script/lint - test: - image: test - build: - context: . - dockerfile: Dockerfile.cibuild - entrypoint: - - script/test - test-build: - image: test-build - build: - context: . - dockerfile: Dockerfile.cibuild - entrypoint: - - script/test-build +# version: "3.5" +# services: +# lint: +# image: lint +# build: +# context: . +# dockerfile: Dockerfile.cibuild +# entrypoint: +# - script/lint +# test: +# image: test +# build: +# context: . +# dockerfile: Dockerfile.cibuild +# entrypoint: +# - script/test +# test-build: +# image: test-build +# build: +# context: . +# dockerfile: Dockerfile.cibuild +# entrypoint: +# - script/test-build diff --git a/script/bootstrap-sanity-test.ps1 b/script/bootstrap-sanity-test.ps1 index 3bfe5d5..355206a 100644 --- a/script/bootstrap-sanity-test.ps1 +++ b/script/bootstrap-sanity-test.ps1 @@ -4,7 +4,7 @@ if($IsLinux) { } elseif ($IsWindows) { $file_postfix = "windows_amd64" } elseif ($IsMacOS) { - $file_postfix = "darwin_amd64" + $file_postfix = "darwin_arm64" } # Download release to test