diff --git a/.github/workflows/continous-delivery.yml b/.github/workflows/continous-delivery.yml index 990e648..d2ed7c2 100644 --- a/.github/workflows/continous-delivery.yml +++ b/.github/workflows/continous-delivery.yml @@ -5,7 +5,7 @@ name: "Continous Delivery Workflow" secrets: DOCKERHUB_USERNAME: required: true - DOCKERHUB_TOKEN: + DOCKERHUB_PASSWORD: required: true env: @@ -29,8 +29,7 @@ jobs: with: registry: registry.hub.docker.com username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - + password: ${{ secrets.DOCKERHUB_PASSWORD }} - name: Log in to the Container registry uses: docker/login-action@v2 @@ -56,9 +55,7 @@ jobs: push: true tags: ${{ github.repository }}:latest,${{ github.repository }}:${{ github.sha }},${{ github.repository }}:${{ github.ref_name }} - release-binary: - name: Release on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: @@ -82,9 +79,8 @@ jobs: - name: Build env: - RELEASE_VERSION: ${{ github.ref_name }} - + run: make release-${{ matrix.os }} - name: Release @@ -93,4 +89,3 @@ jobs: files: build/*.zip env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - \ No newline at end of file diff --git a/.github/workflows/continous-deployment.yml b/.github/workflows/continous-deployment.yml index 5739132..73179dc 100644 --- a/.github/workflows/continous-deployment.yml +++ b/.github/workflows/continous-deployment.yml @@ -1,11 +1,10 @@ # FILE IS AUTOMATICALLY MANAGED BY github.com/vegaprotocol/terraform//github name: "Continous Deployment Workflow" "on": - push: tags: - v* - + jobs: integration: uses: ./.github/workflows/continous-integration.yml @@ -14,7 +13,7 @@ jobs: uses: ./.github/workflows/continous-delivery.yml secrets: DOCKERHUB_USERNAME: ${ secrets.DOCKERHUB_USERNAME } - DOCKERHUB_TOKEN: ${ secrets.DOCKERHUB_TOKEN } + DOCKERHUB_PASSWORD: ${ secrets.DOCKERHUB_PASSWORD } update-manifest-repo: needs: delivery runs-on: ubuntu-latest @@ -26,15 +25,15 @@ jobs: with: ssh-private-key: ${{ secrets.VEGA_CI_SSH_KEY }} - run: | - + version=$(git describe --tags --abbrev=0) - + git config --global user.name 'vega-ci-bot' git config --global user.email 'dev@vega.xyz' git clone git@github.com:vegaprotocol/k8s.git - + echo -n "$version" > k8s/charts/apps/liqbot/stagnet2/VERSION - + ( cd k8s git add -A