tetratelabs
diff --git a/‎.circleci/config.yml‎
Lines changed: 20 additions & 25 deletions b/‎.circleci/config.yml‎
Lines changed: 20 additions & 25 deletions
diff --git a/‎.dockerignore‎
Lines changed: 3 additions & 0 deletions b/‎.dockerignore‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎.editorconfig‎
Lines changed: 13 additions & 0 deletions b/‎.editorconfig‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎.gitattributes‎
Lines changed: 6 additions & 0 deletions b/‎.gitattributes‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎.github/workflows/builders.yml‎
Lines changed: 35 additions & 0 deletions b/‎.github/workflows/builders.yml‎
Lines changed: 35 additions & 0 deletions
diff --git a/‎.github/workflows/commit.yaml‎
Lines changed: 103 additions & 0 deletions b/‎.github/workflows/commit.yaml‎
Lines changed: 103 additions & 0 deletions
@@ -12,52 +12,47 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version: 2.0
+version: 2.1
 
-jobs:
-  lint:
+executors:
+  builder:
     docker:
       - image: circleci/golang:1.13.3
+
+jobs:
+  lint:
+    executor: builder
+    resource_class: medium+
     environment:
       # Run garbage collection more aggresively to avoid getting OOMed during the lint phase.
       GOGC: "20"
       # Circle CI executor has many cores (> 30) but throttles CPU and RAM. If we don't limit
       # this to the number of allocated cores, the job is likely to get OOMed and killed.
-      GOMAXPROCS: "2"
+      GOMAXPROCS: "3"
     steps:
       - checkout
+      - run: make init
       - run: ./ci/install-lint
       - run: ./ci/lint
 
   test:
-    resource_class: small
-    docker:
-      - image: circleci/golang:1.13.3
+    executor: builder
+    resource_class: medium+
     steps:
       - checkout
+      - run: make init
       - run: ./ci/install-envoy
       - run: ./ci/test
-      
-  release:
-    docker:
-      - image: circleci/golang:1.13.3
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run: echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
-      - run: curl -sL https://git.io/goreleaser | bash
+      - run:
+          name: "Measure test coverage (for now, on a subset of tests)"
+          command: make coverage GO_COVERAGE_EXTRA_OPTS="-p 1"
+      - store_artifacts:
+          path: build/coverage
+          destination: /coverage
 
 workflows:
   version: 2
-  all:
+  commit:
     jobs:
       - lint
       - test
-  release:
-    jobs:
-      - release:
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*(-.*)*/
@@ -0,0 +1,3 @@
+/build/
+!/build/bin/linux/amd64/getenvoy
+/dist/
@@ -0,0 +1,13 @@
+# see https://github.com/mvdan/sh#shfmt
+[*.sh]
+indent_style = tab
+
+shell_variant      = bash
+binary_next_line   = true  # like -bn
+switch_case_indent = true  # like -ci
+space_redirects    = true  # like -sr
+keep_padding       = true  # like -kp
+
+[godownloader.sh]
+# auto-generated file
+ignore = true
@@ -0,0 +1,6 @@
+#
+# Exclude extension template code from the repository's language statistics.
+#
+# See https://github.com/github/linguist/#detectable
+#
+/data/extension/init/templates/** -linguist-detectable
@@ -0,0 +1,35 @@
+name: builders
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+    - images/extension-builders/**
+  pull_request:
+    branches: [ master ]
+    paths:
+    - images/extension-builders/**
+
+jobs:
+  builders:
+    runs-on: ubuntu-18.04
+
+    steps:
+    - uses: actions/checkout@v2
+  
+    - name: Build the Docker image
+      run: make builders BUILDERS_TAG=${{ github.sha }}
+
+    - uses: azure/docker-login@v1
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_PASSWORD }}
+      if: github.event_name == 'push'
+    
+    - name: Push the Docker image
+      run: make builders.push BUILDERS_TAG=${{ github.sha }}
+      if: github.event_name == 'push'
+    
+    - name: Mark the Docker image latest
+      run: make builders.push BUILDERS_TAG=latest
+      if: github.ref == 'refs/heads/master' && github.event_name == 'push'
@@ -0,0 +1,103 @@
+# `name` value will appear "as is" in the badge.
+# See https://docs.github.com/en/actions/configuring-and-managing-workflows/configuring-a-workflow#adding-a-workflow-status-badge-to-your-repository
+name: "build"
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - '**'
+
+jobs:
+  bin:
+    name: "Build `getenvoy` and `e2e` binaries for use in e2e tests"
+    runs-on: ubuntu-latest
+    steps:
+    - name: "Checkout"
+      uses: actions/checkout@v2
+
+    - name: "Install Go"
+      uses: actions/setup-go@v2
+      with:
+        go-version: '1.13.3'
+
+    - name: "Init on first use"
+      run: make init
+
+    - name: "Build `getenvoy` and `e2e` binaries"
+      run: make bin
+
+    - name: "Share `getenvoy` and `e2e` binaries with the downstream jobs"
+      uses: actions/upload-artifact@v2
+      with:
+        name: bin
+        path: build/bin
+
+  e2e_linux:
+    name: "Run e2e tests on Linux"
+    needs:
+    - bin
+    runs-on: ubuntu-latest
+    steps:
+    - name: "Checkout"
+      uses: actions/checkout@v2
+
+    - name: "Re-use `getenvoy` and `e2e` binaries pre-built by the upstream job"
+      uses: actions/download-artifact@v2
+      with:
+        name: bin
+        path: build/bin
+
+    - name: "Build language-specific Docker build images"
+      run: make builders
+
+    - name: "Run e2e tests using `getenvoy` and `e2e` binaries built by the upstream job"
+      env:
+        # Allow extension templates to have dependecies on private GitHub repositories.
+        E2E_ALLOW_PRIVATE_DEPENDENCIES: 'yes'
+        # Key of a GitHub "machine user" that has access to all private repositories needed by e2e tests:
+        #   user:           https://github.com/getenvoy-ci
+        #   key fingeprint: MD5:ae:8d:18:6a:1b:44:17:dc:b8:c8:0f:a9:48:44:be:2b
+        #
+        # See https://developer.github.com/v3/guides/managing-deploy-keys/#machine-users
+        E2E_GITHUB_MACHINE_USER_KEY: ${{ secrets.E2E_GITHUB_MACHINE_USER_KEY }}
+      run: ./ci/e2e/linux/run_tests.sh
+
+  e2e_macos:
+    name: "Run e2e tests on MacOS"
+    needs:
+    - bin
+    runs-on: macos-latest
+    steps:
+    - name: "Checkout"
+      uses: actions/checkout@v2
+
+    - name: "Re-use `getenvoy` and `e2e` binaries pre-built by the upstream job"
+      uses: actions/download-artifact@v2
+      with:
+        name: bin
+        path: build/bin
+
+    - name: "Install 'Docker for Mac' (an older version that can be installed in CI environment)"
+      run: ./ci/e2e/macos/install_docker.sh
+
+    - name: "Build language-specific Docker build images"
+      env:
+        # don't use `DOCKER_BUILDKIT=1`, `--build-arg BUILDKIT_INLINE_CACHE=1` and `--cache-from`
+        # options when using `Docker for Mac` in CI environment
+        USE_DOCKER_BUILDKIT_CACHE: 'no'
+      run: make builders
+
+    - name: "Run e2e tests using `getenvoy` and `e2e` binaries built by the upstream job"
+      env:
+        # Allow extension templates to have dependecies on private GitHub repositories.
+        E2E_ALLOW_PRIVATE_DEPENDENCIES: 'yes'
+        # Key of a GitHub "machine user" that has access to all private repositories needed by e2e tests:
+        #   user:           https://github.com/getenvoy-ci
+        #   key fingeprint: MD5:ae:8d:18:6a:1b:44:17:dc:b8:c8:0f:a9:48:44:be:2b
+        #
+        # See https://developer.github.com/v3/guides/managing-deploy-keys/#machine-users
+        E2E_GITHUB_MACHINE_USER_KEY: ${{ secrets.E2E_GITHUB_MACHINE_USER_KEY }}
+      run: ./ci/e2e/macos/run_tests.sh
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+/build/`
	`2`	`+!/build/bin/linux/amd64/getenvoy`
	`3`	`+/dist/`