Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert sync automation changes from may 11 #5252

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/api-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
test:
strategy:
matrix:
go-version: [1.19.x]
go-version: [1.16.x]
platform: [ubuntu-latest]
arch: [amd64]
node-version: [15.x]
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# Generated by: gromit policy
# Generated on: Fri Jun 16 08:40:35 UTC 2023
# Generated on: Thu May 11 05:45:42 UTC 2023


# Distribution channels covered by this workflow
Expand Down Expand Up @@ -43,8 +43,8 @@ jobs:
debvers: 'ubuntu/xenial ubuntu/bionic debian/jessie'
- golang_cross: 1.15
goreleaser: 'ci/goreleaser/goreleaser.yml'
rpmvers: 'el/8 el/9'
debvers: 'ubuntu/bionic ubuntu/focal ubuntu/jammy debian/buster debian/bullseye'
rpmvers: 'el/8'
debvers: 'ubuntu/focal debian/buster debian/bullseye'
outputs:
tag: ${{ steps.targets.outputs.tag }}

Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:

- uses: goreleaser/goreleaser-action@v4
with:
version: latest
version: 1.18.2
args: release --clean -f ${{ matrix.goreleaser }} ${{ !startsWith(github.ref, 'refs/tags/') && ' --snapshot' || '' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
1 change: 1 addition & 0 deletions ci/images/hybrid/tyk/tyk.conf
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"enable_health_checks": false,
"health_check_value_timeouts": 60
},
"optimisations_use_async_session_write": true,
"allow_master_keys": false,
"policies": {
"policy_source": "rpc",
Expand Down
1 change: 1 addition & 0 deletions ci/images/hybrid/tyk/tyk.conf.example
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"enable_health_checks": false,
"health_check_value_timeouts": 60
},
"optimisations_use_async_session_write": true,
"allow_master_keys": false,
"policies": {
"policy_source": "mongo",
Expand Down
25 changes: 7 additions & 18 deletions ci/images/plugin-compiler/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,34 +1,23 @@
ARG BASE_IMAGE
FROM ${BASE_IMAGE}
ARG GOLANG_CROSS=1.15

FROM tykio/golang-cross:${GOLANG_CROSS}
LABEL description="Image for plugin development"

ENV TYK_GW_PATH=/go/src/github.com/TykTechnologies/tyk

ENV GO111MODULE=on

# This directory will contain the plugin source and will be
# mounted from the host box by the user using docker volumes
ENV PLUGIN_SOURCE_PATH=/plugin-source

RUN mkdir -p $TYK_GW_PATH $PLUGIN_SOURCE_PATH

RUN apt-get remove -y --allow-remove-essential --auto-remove mercurial \
&& rm /usr/bin/passwd && rm /usr/sbin/adduser

ADD go.mod go.sum $TYK_GW_PATH
WORKDIR $TYK_GW_PATH
RUN go mod download

ADD . $TYK_GW_PATH

ARG GITHUB_SHA
ARG GITHUB_TAG
ARG BASE_IMAGE
ENV BASE_IMAGE ${BASE_IMAGE}
ENV GITHUB_SHA ${GITHUB_SHA}
ENV GITHUB_TAG ${GITHUB_TAG}

COPY ci/images/plugin-compiler/data/build.sh /build.sh
RUN chmod +x /build.sh

COPY . $TYK_GW_PATH
RUN cd $TYK_GW_PATH && go mod vendor

ENTRYPOINT ["/build.sh"]

3 changes: 0 additions & 3 deletions ci/images/plugin-compiler/data/basic-plugin/go.mod

This file was deleted.

196 changes: 0 additions & 196 deletions ci/images/plugin-compiler/data/basic-plugin/test_goplugin.go

This file was deleted.

47 changes: 0 additions & 47 deletions ci/images/plugin-compiler/data/basic-plugin/test_goplugin_test.go

This file was deleted.

Loading
Loading