From d81f1f394cf1ce9a519ae3d7aa07708516674721 Mon Sep 17 00:00:00 2001
From: Kirill Bilchenko <kirillbilchenko@users.noreply.github.com>
Date: Fri, 24 Sep 2021 09:07:16 +0200
Subject: [PATCH] Upstream 1.6.9 (#24)

Update pipeline
* Added ability to build Ggr with pprof support (fixes #281)

* Logging request proxy errors (fixes #290)

* Correctly proxying HTTPS requests to hosts (fixes #273)

* Doing minimum RLock calls possible (fixes #292)

* Correctly working with gzipped requests (fixes #294)

* Ability to use root token as authentication measure (fixes #298)

* Adding ca-certificates to correctly work with external services (fixes #305)

* Migrated to Golang 1.14 (fixes #317)

* Migrated to Github Actions (fixes #319)

* Logging platform name (fixes #316)

* Correctly processing platform and platformName capabilities (fixes #313)

* Fixed release workflow name

* Added stale.yml file

* Bump Golang to 1.15

* Bump Alpine version to 3.12

* Replaced set-env instruction in Github Actions with safer one

* Bump Golang to 1.16

* Ability to print labels from extension capabilities (fixes #339)

* Bump Alpine image version

* Getting capability value from json wire and w3c sections

* Better quick-start-guide.adoc

* Explicitly setting browserVersion in top-level capabilites only

* Cleanup

* Update pipeline

Co-authored-by: Ivan Krutov <vania-pooh@vania-pooh.com>
Co-authored-by: Alexander Andryashin <aandryashin@gmail.com>
Co-authored-by: Ivan Krutov <vania-pooh@aerokube.com>
---
 .github/workflows/build.yml   |  20 +++----
 .github/workflows/release.yml | 108 +++++++++++++++++-----------------
 2 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2e48fdd..e84742c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,13 +29,13 @@ jobs:
       - name: Build
         run: ci/build.sh
 
-      - name: Latest image
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-        run: ci/docker-push.sh latest
-
-      - name: Latest docs
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ci/docs.sh latest ${{ secrets.GITHUB_TOKEN }}
+#      - name: Latest image
+#        env:
+#          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+#          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+#        run: ci/docker-push.sh latest
+#
+#      - name: Latest docs
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#        run: ci/docs.sh latest ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 218974d..90e2839 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,54 +1,54 @@
-name: release
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  golang:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup Golang
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.16.x
-
-      - uses: actions/cache@v1
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
-      - name: Test
-        run: ci/test.sh
-
-      - name: Build
-        run: ci/build.sh
-
-      - name: Prepare release version
-        run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
-
-      - uses: AButler/upload-release-assets@v2.0
-        with:
-          files: 'dist/*'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Release image
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-        run: ci/docker-push.sh $RELEASE_VERSION
-
-      - name: Latest release image
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-        run: ci/docker-push.sh latest-release
-
-      - name: Release docs
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ci/docs.sh $RELEASE_VERSION ${{ secrets.GITHUB_TOKEN }}
+#name: release
+#
+#on:
+#  release:
+#    types: [published]
+#
+#jobs:
+#  golang:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v2
+#
+#      - name: Setup Golang
+#        uses: actions/setup-go@v2
+#        with:
+#          go-version: 1.16.x
+#
+#      - uses: actions/cache@v1
+#        with:
+#          path: ~/go/pkg/mod
+#          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+#          restore-keys: |
+#            ${{ runner.os }}-go-
+#
+#      - name: Test
+#        run: ci/test.sh
+#
+#      - name: Build
+#        run: ci/build.sh
+#
+#      - name: Prepare release version
+#        run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
+#
+#      - uses: AButler/upload-release-assets@v2.0
+#        with:
+#          files: 'dist/*'
+#          repo-token: ${{ secrets.GITHUB_TOKEN }}
+#
+#      - name: Release image
+#        env:
+#          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+#          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+#        run: ci/docker-push.sh $RELEASE_VERSION
+#
+#      - name: Latest release image
+#        env:
+#          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+#          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+#        run: ci/docker-push.sh latest-release
+#
+#      - name: Release docs
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#        run: ci/docs.sh $RELEASE_VERSION ${{ secrets.GITHUB_TOKEN }}