From b3bb7d6937360a357bcea4510988d66f5c45caa2 Mon Sep 17 00:00:00 2001 From: Lucas Ontivero Date: Fri, 5 Jul 2024 11:53:23 -0300 Subject: [PATCH 1/2] ----- From f7eef8e2798892fe595715ff87ab846c24503799 Mon Sep 17 00:00:00 2001 From: Lucas Ontivero Date: Fri, 5 Jul 2024 12:14:46 -0300 Subject: [PATCH 2/2] Add git user name and email --- .github/workflows/build-and-deploy.yml | 5 +++- azure-pipelines.yml | 32 -------------------------- 2 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 azure-pipelines.yml diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 08ae75d1d..9a7f4860b 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -30,4 +30,7 @@ jobs: - name: Deploy to GitHub Pages env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: npm run deploy -r https://${{ secrets.GITHUB_TOKEN }}@github.com/WalletWasabi/WasabiDoc -u "CI" + run: + git config user.email "ci-deployer@howknows.com" + git config user.name "ci-deployer" + npm run deploy -r https://${{ secrets.GITHUB_TOKEN }}@github.com/WalletWasabi/WasabiDoc diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index 7e5966036..000000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,32 +0,0 @@ -# https://aka.ms/yaml - -trigger: -- master - -pool: - vmImage: 'ubuntu-latest' - -variables: - npm_config_cache: $(Pipeline.Workspace)/.npm - -steps: -- checkout: self - persistCredentials: true -- task: NodeTool@0 - inputs: - versionSpec: '18.x' - displayName: 'Install Node.js' -- task: CacheBeta@0 - inputs: - key: $(Build.SourcesDirectory)/package-lock.json - path: $(npm_config_cache) - displayName: Cache npm -- script: | - npm ci - npm run build -- script: | - npm run deploy -- -r https://$(DEPLOY_ACCESS_TOKEN)@github.com/WalletWasabi/WasabiDoc.git -u "Azure Pipeline " - displayName: 'Build and deploy' - condition: | - and(not(eq(variables['Build.Reason'], 'PullRequest')), - eq(variables['Build.SourceBranch'], 'refs/heads/master'))