diff --git a/.github/workflows/_terraformEnvironmentTemplate.yml b/.github/workflows/_terraformEnvironmentTemplate.yml index 6752451..56a6b10 100644 --- a/.github/workflows/_terraformEnvironmentTemplate.yml +++ b/.github/workflows/_terraformEnvironmentTemplate.yml @@ -12,6 +12,15 @@ on: required: true type: string description: "Specifies the working directory." + export_terraform_outputs: + required: false + type: boolean + default: false + description: "Specifies whether terraform outputs should be exported." + subscription_id: + required: true + type: string + description: "Specifies the Azure subscription id." secrets: TENANT_ID: required: true @@ -22,42 +31,15 @@ on: CLIENT_SECRET: required: true description: "Specifies the client secret." - SUBSCRIPTION_ID: - required: true - description: "Specifies the client id." - PAT: - required: true - description: "Specifies the GitHub PAT." - DNS_API_PASSWORD: - required: true - description: "Specifies the API Password for DNS entries." outputs: - mgmt_synapse_workspace_resource_group_name: - description: "The resource group name of the management synapse workspace." - value: ${{ jobs.apply.outputs.mgmt_synapse_workspace_resource_group_name }} - mgmt_synapse_workspace_name: - description: "The name of the management synapse workspace." - value: ${{ jobs.apply.outputs.mgmt_synapse_workspace_name }} - mgmt_synapse_workspace_sql_pool_name: - description: "The name of the management synapse workspace SQL Pool." - value: ${{ jobs.apply.outputs.mgmt_synapse_workspace_sql_pool_name }} - mgmt_synapse_workspace_uri_sql: - description: "The uri of the management synapse workspace." - value: ${{ jobs.apply.outputs.mgmt_synapse_workspace_uri_sql }} - mgmt_details: - description: "Specifies the mgmt details for the SQL deployment." - value: ${{ jobs.apply.outputs.mgmt_details }} - core_details: - description: "Specifies the core details for the SQL deployment." - value: ${{ jobs.apply.outputs.core_details }} - extension_details: - description: "Specifies the extension details for the SQL deployment." - value: ${{ jobs.apply.outputs.extension_details }} + test: + description: "A sample value." + value: ${{ jobs.apply.outputs.test }} jobs: lint: name: Terraform Lint - runs-on: [self-hosted, linux, original] + runs-on: [self-hosted] continue-on-error: false needs: [] @@ -76,14 +58,14 @@ jobs: plan: name: Terraform Plan - runs-on: [self-hosted, linux, original] + runs-on: [self-hosted] continue-on-error: false environment: ${{ inputs.environment }} needs: [lint] env: ARM_TENANT_ID: ${{ secrets.TENANT_ID }} - ARM_SUBSCRIPTION_ID: ${{ secrets.SUBSCRIPTION_ID }} + ARM_SUBSCRIPTION_ID: ${{ inputs.subscription_id }} ARM_CLIENT_ID: ${{ secrets.CLIENT_ID }} ARM_CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }} ARM_USE_OIDC: false @@ -99,11 +81,7 @@ jobs: id: terraform_init working-directory: ${{ inputs.working_directory }} run: | - export HOME=$(pwd -P) - git config --global url."https://$PAT@github.developer.allianz.io".insteadOf https://github.developer.allianz.io terraform init - env: - PAT: ${{ secrets.PAT }} # Terraform Validate - name: Terraform Validate @@ -117,27 +95,21 @@ jobs: id: terraform_plan working-directory: ${{ inputs.working_directory }} run: | - terraform plan -var-file vars.${{ inputs.environment }}.tfvars -var='dns_api_password=${{ secrets.DNS_API_PASSWORD }}' -input=false + terraform plan -var-file vars.${{ inputs.environment }}.tfvars -input=false apply: name: Terraform Apply - runs-on: [self-hosted, linux, original] + runs-on: [self-hosted] continue-on-error: false environment: ${{ inputs.environment }} # if: github.event_name == 'push' || github.event_name == 'release' needs: [lint, plan] outputs: - mgmt_synapse_workspace_resource_group_name: ${{ steps.terraform_outputs.outputs.mgmt_synapse_workspace_resource_group_name }} - mgmt_synapse_workspace_name: ${{ steps.terraform_outputs.outputs.mgmt_synapse_workspace_name }} - mgmt_synapse_workspace_sql_pool_name: ${{ steps.terraform_outputs.outputs.mgmt_synapse_workspace_sql_pool_name }} - mgmt_synapse_workspace_uri_sql: ${{ steps.terraform_outputs.outputs.mgmt_synapse_workspace_uri_sql }} - mgmt_details: ${{ steps.terraform_outputs.outputs.mgmt_details }} - core_details: ${{ steps.terraform_outputs.outputs.core_details }} - extension_details: ${{ steps.terraform_outputs.outputs.extension_details }} + test: ${{ steps.terraform_outputs.outputs.test }} env: ARM_TENANT_ID: ${{ secrets.TENANT_ID }} - ARM_SUBSCRIPTION_ID: ${{ secrets.SUBSCRIPTION_ID }} + ARM_SUBSCRIPTION_ID: ${{ inputs.subscription_id }} ARM_CLIENT_ID: ${{ secrets.CLIENT_ID }} ARM_CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }} ARM_USE_OIDC: false @@ -153,49 +125,28 @@ jobs: id: azure_login uses: azure/login@v1 with: - creds: '{"clientId":"${{ secrets.CLIENT_ID }}","clientSecret":"${{ secrets.CLIENT_SECRET }}","subscriptionId":"${{ secrets.SUBSCRIPTION_ID }}","tenantId":"${{ secrets.TENANT_ID }}"}' + creds: '{"clientId":"${{ secrets.CLIENT_ID }}","clientSecret":"${{ secrets.CLIENT_SECRET }}","subscriptionId":"${{ inputs.subscription_id }}","tenantId":"${{ secrets.TENANT_ID }}"}' # Terraform Init - name: Terraform Init working-directory: ${{ inputs.working_directory }} run: | - export HOME=$(pwd -P) - git config --global url."https://$PAT@github.developer.allianz.io".insteadOf https://github.developer.allianz.io terraform init - env: - PAT: ${{ secrets.PAT }} # Terraform Apply - name: Terraform Apply working-directory: ${{ inputs.working_directory }} run: | - terraform apply -var-file vars.${{ inputs.environment }}.tfvars -var='dns_api_password=${{ secrets.DNS_API_PASSWORD }}' -auto-approve -input=false + terraform apply -var-file vars.${{ inputs.environment }}.tfvars -auto-approve -input=false # Terraform Export Outputs - name: Terraform Export Outputs id: terraform_outputs working-directory: ${{ inputs.working_directory }} + if: inputs.export_terraform_outputs run: | - mgmt_synapse_workspace_resource_group_name=$(terraform output -raw mgmt_synapse_workspace_resource_group_name) - echo "mgmt_synapse_workspace_resource_group_name=$mgmt_synapse_workspace_resource_group_name" >> "$GITHUB_OUTPUT" - - mgmt_synapse_workspace_name=$(terraform output -raw mgmt_synapse_workspace_name) - echo "mgmt_synapse_workspace_name=$mgmt_synapse_workspace_name" >> "$GITHUB_OUTPUT" - - mgmt_synapse_workspace_sql_pool_name=$(terraform output -raw mgmt_synapse_workspace_sql_pool_name) - echo "mgmt_synapse_workspace_sql_pool_name=$mgmt_synapse_workspace_sql_pool_name" >> "$GITHUB_OUTPUT" - - mgmt_synapse_workspace_uri_sql=$(terraform output -raw mgmt_synapse_workspace_uri_sql) - echo "mgmt_synapse_workspace_uri_sql=$mgmt_synapse_workspace_uri_sql" >> "$GITHUB_OUTPUT" - - mgmt_details=$(terraform output -raw mgmt_details) - echo "mgmt_details=$mgmt_details" >> "$GITHUB_OUTPUT" - - core_details=$(terraform output -raw core_details) - echo "core_details=$core_details" >> "$GITHUB_OUTPUT" - - extension_details=$(terraform output -raw extension_details) - echo "extension_details=$extension_details" >> "$GITHUB_OUTPUT" + test=$(terraform output -raw test) + echo "test=$test" >> "$GITHUB_OUTPUT" # Log out from Azure - name: Log out from Azure diff --git a/.github/workflows/_sqlEnvironmentTemplate.yml b/.github/workflows/archive/_sqlEnvironmentTemplate.yml similarity index 79% rename from .github/workflows/_sqlEnvironmentTemplate.yml rename to .github/workflows/archive/_sqlEnvironmentTemplate.yml index d4e4308..d22986a 100644 --- a/.github/workflows/_sqlEnvironmentTemplate.yml +++ b/.github/workflows/archive/_sqlEnvironmentTemplate.yml @@ -8,11 +8,10 @@ on: type: string default: "dev" description: "Specifies the environment of the deployment." - init_project_version: - required: false + subscription_id: + required: true type: string - default: "main" - description: "Specifies the version of the Init project." + description: "Specifies the Azure subscription id." target_server_uri: required: true type: string @@ -21,18 +20,6 @@ on: required: true type: string description: "Specifies the target database name of the SQL project." - mgmt_details: - required: true - type: string - description: "Specifies the mgmt details for the SQL deployment." - core_details: - required: true - type: string - description: "Specifies the core details for the SQL deployment." - extension_details: - required: true - type: string - description: "Specifies the extension details for the SQL deployment." secrets: TENANT_ID: required: true @@ -43,12 +30,6 @@ on: CLIENT_SECRET: required: true description: "Specifies the client secret." - SUBSCRIPTION_ID: - required: true - description: "Specifies the client id." - PAT: - required: true - description: "Specifies the GitHub PAT." env: SQL_PROJECT_NAME: "sqlDbProject" @@ -61,7 +42,7 @@ env: jobs: build: name: Build SQL Project - runs-on: [self-hosted, linux, original] + runs-on: [self-hosted] continue-on-error: false needs: [] @@ -70,17 +51,12 @@ jobs: - name: Check Out Repository id: checkout_repository uses: actions/checkout@v3 - with: - repository: Financial-Data-Pool/content-template - ref: ${{ inputs.init_project_version }} - token: ${{ secrets.PAT }} # Build Database project - name: Build Database project id: dotnet_build working-directory: ${{ env.SQL_BUILD_PATH }} run: | - export HOME=$(pwd -P) dotnet build /p:NetCoreBuild=true --configuration Release --output ./${{ env.SQL_BUILD_OUTPUT_PATH }} # Upload SQL Package Artifacts @@ -93,7 +69,7 @@ jobs: report: name: Report SQL Project Changes - runs-on: [self-hosted, linux, original] + runs-on: [self-hosted] continue-on-error: false environment: ${{ inputs.environment }} needs: [build] @@ -112,14 +88,14 @@ jobs: id: azure_login uses: azure/login@v1 with: - creds: '{"clientId":"${{ secrets.CLIENT_ID }}","clientSecret":"${{ secrets.CLIENT_SECRET }}","subscriptionId":"${{ secrets.SUBSCRIPTION_ID }}","tenantId":"${{ secrets.TENANT_ID }}"}' + creds: '{"clientId":"${{ secrets.CLIENT_ID }}","clientSecret":"${{ secrets.CLIENT_SECRET }}","subscriptionId":"${{ inputs.subscription_id }}","tenantId":"${{ secrets.TENANT_ID }}"}' # Generate Azure Active Directory Token - name: Generate Azure Active Directory Token id: azure_access_token run: | echo "Set Azure Context" - az account set -s "${{ secrets.SUBSCRIPTION_ID }}" + az account set -s "${{ inputs.subscription_id }}" echo "Create Azure Access Token" ACCESS_TOKEN=$(az account get-access-token --scope "https://database.windows.net/.default" --query "accessToken" -o tsv) @@ -132,12 +108,6 @@ jobs: id: output_directory run: mkdir -p ${{ env.SQL_REPORT_OUTPUT_PATH }} - # Add sql package to path - - name: Add sqlpackage to PATH - id: sqlpackage_path - run: | - echo "/home/actions/sqlpackage" >> $GITHUB_PATH - # SQL Package Version - name: SQL Package Version id: sqlpackage_version @@ -172,7 +142,7 @@ jobs: deploy: name: Deploy SQL Project - runs-on: [self-hosted, linux, original] + runs-on: [self-hosted] continue-on-error: false environment: ${{ inputs.environment }} # if: github.event_name == 'push' || github.event_name == 'release' @@ -192,14 +162,14 @@ jobs: id: azure_login uses: azure/login@v1 with: - creds: '{"clientId":"${{ secrets.CLIENT_ID }}","clientSecret":"${{ secrets.CLIENT_SECRET }}","subscriptionId":"${{ secrets.SUBSCRIPTION_ID }}","tenantId":"${{ secrets.TENANT_ID }}"}' + creds: '{"clientId":"${{ secrets.CLIENT_ID }}","clientSecret":"${{ secrets.CLIENT_SECRET }}","subscriptionId":"${{ inputs.subscription_id }}","tenantId":"${{ secrets.TENANT_ID }}"}' # Generate Azure Active Directory Token - name: Generate Azure Active Directory Token id: azure_access_token run: | echo "Set Azure Context" - az account set -s "${{ secrets.SUBSCRIPTION_ID }}" + az account set -s "${{ inputs.subscription_id }}" echo "Create Azure Access Token" ACCESS_TOKEN=$(az account get-access-token --scope "https://database.windows.net/.default" --query "accessToken" -o tsv) @@ -207,12 +177,6 @@ jobs: echo "Set secret value" echo "azureAccessToken=$ACCESS_TOKEN" >> "$GITHUB_OUTPUT" - # Add sql package to path - - name: Add sqlpackage to PATH - id: sqlpackage_path - run: | - echo "/home/actions/sqlpackage" >> $GITHUB_PATH - # SQL Package Version - name: SQL Package Version id: sqlpackage_version diff --git a/.github/workflows/_synapseEnvironmentTemplate.yml b/.github/workflows/archive/_synapseEnvironmentTemplate.yml similarity index 76% rename from .github/workflows/_synapseEnvironmentTemplate.yml rename to .github/workflows/archive/_synapseEnvironmentTemplate.yml index 9a06f06..99ebbfa 100644 --- a/.github/workflows/_synapseEnvironmentTemplate.yml +++ b/.github/workflows/archive/_synapseEnvironmentTemplate.yml @@ -8,11 +8,10 @@ on: type: string default: "dev" description: "Specifies the environment of the deployment." - init_project_version: - required: false + subscription_id: + required: true type: string - default: "main" - description: "Specifies the version of the Init project." + description: "Specifies the Azure subscription id." target_synapse_workspace_name: required: true type: string @@ -36,22 +35,16 @@ on: CLIENT_SECRET: required: true description: "Specifies the client secret." - SUBSCRIPTION_ID: - required: true - description: "Specifies the client id." - PAT: - required: true - description: "Specifies the GitHub PAT." env: - SOURCE_SYNAPSE_WORKSPACE_NAME: "synw-spf-0003-dev-we1-01" + SOURCE_SYNAPSE_WORKSPACE_NAME: "" SYNAPSE_ARTIFACTS_PATH: "code/synapse" SYNAPSE_DEPLOYMENT_SCRIPT_PATH: "code/scripts" jobs: validation: name: Synapse Validation - runs-on: [self-hosted, linux, original] + runs-on: [self-hosted] continue-on-error: false needs: [] @@ -60,10 +53,6 @@ jobs: - name: Check Out Repository id: checkout_repository uses: actions/checkout@v3 - with: - repository: Financial-Data-Pool/simplifi-db-development - ref: ${{ inputs.init_project_version }} - token: ${{ secrets.PAT }} # Validate Synapse Artifacts - name: Validate Synapse Artifacts @@ -78,35 +67,23 @@ jobs: deploy: name: Synapse Deployment - runs-on: [self-hosted, linux, original] + runs-on: [self-hosted] continue-on-error: false environment: ${{ inputs.environment }} needs: [validation] steps: # Check Out Repository - - name: Check Out Rollout Repository - id: checkout_repository_rollout - uses: actions/checkout@v3 - with: - path: rollout - - # Check Out Repository - - name: Check Out Synapse Repository - id: checkout_repository_synapse + - name: Check Out Repository + id: checkout_repository uses: actions/checkout@v3 - with: - repository: Financial-Data-Pool/simplifi-db-development - ref: ${{ inputs.init_project_version }} - token: ${{ secrets.PAT }} - path: synapse # Login to Azure - name: Azure Login id: azure_login uses: azure/login@v1 with: - creds: '{"clientId":"${{ secrets.CLIENT_ID }}","clientSecret":"${{ secrets.CLIENT_SECRET }}","subscriptionId":"${{ secrets.SUBSCRIPTION_ID }}","tenantId":"${{ secrets.TENANT_ID }}"}' + creds: '{"clientId":"${{ secrets.CLIENT_ID }}","clientSecret":"${{ secrets.CLIENT_SECRET }}","subscriptionId":"${{ inputs.subscription_id }}","tenantId":"${{ secrets.TENANT_ID }}"}' enable-AzPSSession: true # Install Required Modules @@ -123,7 +100,7 @@ jobs: id: synapse_preprocessing run: | ./SynapseRolloutPreprocessing.ps1 ` - -SubscriptionId "${{ secrets.SUBSCRIPTION_ID }}" ` + -SubscriptionId "${{ inputs.subscription_id }}" ` -SynapseWorkspaceName "${{ inputs.target_synapse_workspace_name }}" ` -CheckPastDaysOfPipelineRuns 1 shell: pwsh @@ -145,7 +122,7 @@ jobs: DeleteArtifactsNotInTemplate: false Environment: "Azure Public" tenantId: ${{ secrets.TENANT_ID }} - subscriptionId: ${{ secrets.SUBSCRIPTION_ID }} + subscriptionId: ${{ inputs.subscription_id }} clientId: ${{ secrets.CLIENT_ID }} clientSecret: ${{ secrets.CLIENT_SECRET }} managedIdentity: false @@ -155,7 +132,7 @@ jobs: # id: synapse_postprocessing # run: | # ./SynapseRolloutPostprocessing.ps1 ` - # -SubscriptionId "${{ secrets.SUBSCRIPTION_ID }}" ` + # -SubscriptionId "${{ inputs.subscription_id }}" ` # -SynapseWorkspaceName "${{ inputs.target_synapse_workspace_name }}" ` # -TriggerNames "${{ steps.synapse_preprocessing.outputs.triggerNames }}" # shell: pwsh diff --git a/.github/workflows/_terraformDestroyTemplate.yml b/.github/workflows/archive/_terraformDestroyTemplate.yml similarity index 67% rename from .github/workflows/_terraformDestroyTemplate.yml rename to .github/workflows/archive/_terraformDestroyTemplate.yml index dc6c530..738a8eb 100644 --- a/.github/workflows/_terraformDestroyTemplate.yml +++ b/.github/workflows/archive/_terraformDestroyTemplate.yml @@ -12,6 +12,10 @@ on: required: true type: string description: "Specifies the working directory." + subscription_id: + required: true + type: string + description: "Specifies the Azure subscription id." secrets: TENANT_ID: required: true @@ -22,26 +26,17 @@ on: CLIENT_SECRET: required: true description: "Specifies the client secret." - SUBSCRIPTION_ID: - required: true - description: "Specifies the client id." - PAT: - required: true - description: "Specifies the GitHub PAT." - DNS_API_PASSWORD: - required: true - description: "Specifies the API Password for DNS entries." jobs: deployment: name: Terraform Destroy - runs-on: [self-hosted, linux, original] + runs-on: [self-hosted] continue-on-error: false environment: ${{ inputs.environment }} env: ARM_TENANT_ID: ${{ secrets.TENANT_ID }} - ARM_SUBSCRIPTION_ID: ${{ secrets.SUBSCRIPTION_ID }} + ARM_SUBSCRIPTION_ID: ${{ inputs.subscription_id }} ARM_CLIENT_ID: ${{ secrets.CLIENT_ID }} ARM_CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }} ARM_USE_OIDC: false @@ -57,20 +52,16 @@ jobs: id: azure_login uses: azure/login@v1 with: - creds: '{"clientId":"${{ secrets.CLIENT_ID }}","clientSecret":"${{ secrets.CLIENT_SECRET }}","subscriptionId":"${{ secrets.SUBSCRIPTION_ID }}","tenantId":"${{ secrets.TENANT_ID }}"}' + creds: '{"clientId":"${{ secrets.CLIENT_ID }}","clientSecret":"${{ secrets.CLIENT_SECRET }}","subscriptionId":"${{ inputs.subscription_id }}","tenantId":"${{ secrets.TENANT_ID }}"}' # Terraform Init - name: Terraform Init working-directory: ${{ inputs.working_directory }} run: | - export HOME=$(pwd -P) - git config --global url."https://$PAT@github.developer.allianz.io".insteadOf https://github.developer.allianz.io terraform init - env: - PAT: ${{ secrets.PAT }} # Terraform Destroy - name: Terraform Destroy working-directory: ${{ inputs.working_directory }} run: | - terraform apply -var-file vars.${{ inputs.environment }}.tfvars -var='dns_api_password=${{ secrets.DNS_API_PASSWORD }}' -auto-approve -input=false -destroy + terraform apply -var-file vars.${{ inputs.environment }}.tfvars -auto-approve -input=false -destroy diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 77fb689..62e1649 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -29,64 +29,8 @@ jobs: with: environment: "dev" working_directory: "./tests/e2e" + subscription_id: "8f171ff9-2b5b-4f0f-aed5-7fa360a1d094" secrets: TENANT_ID: ${{ secrets.TENANT_ID }} CLIENT_ID: ${{ secrets.CLIENT_ID }} CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }} - SUBSCRIPTION_ID: ${{ secrets.SUBSCRIPTION_ID }} - PAT: ${{ secrets.PAT }} - DNS_API_PASSWORD: ${{ secrets.DNS_API_PASSWORD }} - - sql: - uses: ./.github/workflows/_sqlEnvironmentTemplate.yml - name: "SQL Deployment" - needs: [terraform] - # if: github.event_name == 'push' || github.event_name == 'release' - with: - environment: "dev" - init_project_version: "main" - target_server_uri: ${{ needs.terraform.outputs.mgmt_synapse_workspace_uri_sql }} - target_database_name: ${{ needs.terraform.outputs.mgmt_synapse_workspace_sql_pool_name }} - mgmt_details: ${{ needs.terraform.outputs.mgmt_details }} - core_details: ${{ needs.terraform.outputs.core_details }} - extension_details: ${{ needs.terraform.outputs.extension_details }} - secrets: - TENANT_ID: ${{ secrets.TENANT_ID }} - CLIENT_ID: ${{ secrets.CLIENT_ID }} - CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }} - SUBSCRIPTION_ID: ${{ secrets.SUBSCRIPTION_ID }} - PAT: ${{ secrets.PAT }} - - synapse: - uses: ./.github/workflows/_synapseEnvironmentTemplate.yml - name: "Synapse Deployment" - needs: [terraform] - # if: github.event_name == 'push' || github.event_name == 'release' - with: - environment: "dev" - init_project_version: "main" - target_synapse_workspace_name: ${{ needs.terraform.outputs.mgmt_synapse_workspace_name }} - target_synapse_workspace_resource_group_name: ${{ needs.terraform.outputs.mgmt_synapse_workspace_resource_group_name }} - deployment: true - secrets: - TENANT_ID: ${{ secrets.TENANT_ID }} - CLIENT_ID: ${{ secrets.CLIENT_ID }} - CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }} - SUBSCRIPTION_ID: ${{ secrets.SUBSCRIPTION_ID }} - PAT: ${{ secrets.PAT }} - - terraform_destroy: - uses: ./.github/workflows/_terraformDestroyTemplate.yml - name: "Terraform Destroy" - needs: [sql, synapse] - if: github.event_name == 'push' || github.event_name == 'release' - with: - environment: "dev" - working_directory: "./tests/e2e" - secrets: - TENANT_ID: ${{ secrets.TENANT_ID }} - CLIENT_ID: ${{ secrets.CLIENT_ID }} - CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }} - SUBSCRIPTION_ID: ${{ secrets.SUBSCRIPTION_ID }} - PAT: ${{ secrets.PAT }} - DNS_API_PASSWORD: ${{ secrets.DNS_API_PASSWORD }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 0104064..3278a06 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -10,7 +10,8 @@ on: jobs: lint: name: Lint and Test - runs-on: [original] + runs-on: [ubuntu-latest] + continue-on-error: false steps: # Checkout repository diff --git a/.github/workflows/newMajorVersion.yml b/.github/workflows/newMajorVersion.yml index 1bd9114..4986404 100644 --- a/.github/workflows/newMajorVersion.yml +++ b/.github/workflows/newMajorVersion.yml @@ -14,7 +14,7 @@ env: jobs: update_tag: name: Update the major tag to include the ${{ github.event.inputs.tag_name || github.event.release.tag_name }} changes - runs-on: [self-hosted, linux] + runs-on: [ubuntu-latest] steps: # Checkout repository @@ -28,7 +28,6 @@ jobs: - name: Get major version num and update tag id: update_tag run: | - export HOME=$(pwd -P) VERSION=${{ env.TAG_NAME }} MAJOR=${VERSION%%.*} git config --global user.name 'github-action'