Skip to content

Commit 52d0895

Browse files
ad-hoc-uplifts
Summary: - Improved CICD doco. - Migrated duplicate functionality fo `any-sdk`.
1 parent 71f0c15 commit 52d0895

File tree

3 files changed

+8
-46
lines changed

3 files changed

+8
-46
lines changed

docs/CICD.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Summary:
66

77
- At present, PR checks, build and test are all performed through [.github/workflows/build.yml](/.github/workflows/build.yml).
88
- Releasing over various channels (website, homebrew, chocolatey...) is performed manually.
9-
- ~~The strategic state is to split the functions: PR checks, build and test; into separate files, and migrate to use [goreleaser](https://goreleaser.com/).~~
109
- Docker Build and Push Jobs have scope for improvement.
1110
- These are currently based loosely on patterns described in:
1211
- https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners
@@ -18,6 +17,10 @@ Summary:
1817
- **NOTE**: The QEMU build for linux/arm64 is **very slow**. On the order of 30 minutes. This is currently unavoidable.
1918
- **TODO**: Migrate linux/arm64 docker build to native once GHA supports this platform as a first class citizen.
2019
- **NOTE**. Be careful selecting from [the available github actions runners](https://github.com/actions/runner-images). Some runnner instances may be incompatible with assumed toolchain.
20+
- Docker images:
21+
- [production image at `stackql/stackql`](https://hub.docker.com/r/stackql/stackql/tags).
22+
- [development (zero guarantees) image at `stackql/stackql-devel`](https://hub.docker.com/r/stackql/stackql-devel/tags).
23+
2124

2225

2326
## Secrets

internal/stackql/internal_data_transfer/internaldto/exec_payload.go

Lines changed: 0 additions & 42 deletions
This file was deleted.

internal/stackql/primitivegenerator/statement_analyzer.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"github.com/stackql/any-sdk/anysdk"
1111
"github.com/stackql/any-sdk/pkg/constants"
1212
"github.com/stackql/any-sdk/pkg/dto"
13+
anysdk_internaldto "github.com/stackql/any-sdk/pkg/internaldto"
1314
"github.com/stackql/any-sdk/pkg/logging"
1415
"github.com/stackql/stackql/internal/stackql/astformat"
1516
"github.com/stackql/stackql/internal/stackql/astindirect"
@@ -599,7 +600,7 @@ func (pb *standardPrimitiveGenerator) AnalyzeUnaryExec(
599600
if err != nil && reqExists {
600601
return nil, err
601602
}
602-
var execPayload internaldto.ExecPayload
603+
var execPayload anysdk_internaldto.ExecPayload
603604
if node.OptExecPayload != nil {
604605
mediaType := "application/json" //nolint:goconst // acceptable for now
605606
if reqExists && req.GetBodyMediaType() != "" {
@@ -711,7 +712,7 @@ func (pb *standardPrimitiveGenerator) sanitiseMediaType(mediaType string) string
711712
func (pb *standardPrimitiveGenerator) parseExecPayload(
712713
node *sqlparser.ExecVarDef,
713714
payloadType string,
714-
) (internaldto.ExecPayload, error) {
715+
) (anysdk_internaldto.ExecPayload, error) {
715716
var b []byte
716717
m := make(map[string][]string)
717718
var pm map[string]interface{}
@@ -732,7 +733,7 @@ func (pb *standardPrimitiveGenerator) parseExecPayload(
732733
default:
733734
return nil, fmt.Errorf("payload map of declared type = '%T' not allowed", payloadType)
734735
}
735-
return internaldto.NewExecPayload(
736+
return anysdk_internaldto.NewExecPayload(
736737
b,
737738
m,
738739
pm,

0 commit comments

Comments
 (0)