Skip to content

Commit

Permalink
Resetting refs to try again
Browse files Browse the repository at this point in the history
  • Loading branch information
davidpuplava committed Mar 15, 2024
1 parent 6edc47e commit 12d3892
Show file tree
Hide file tree
Showing 31 changed files with 99 additions and 99 deletions.
2 changes: 1 addition & 1 deletion .github/actions/auto-merge-pull-request/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ runs:
id: check-mergeability
# Fork PR runs won't have permissions to remove labels, nor do we want to allow auto-merging them.
if: github.event.pull_request.head.repo.fork == false
uses: Lombiq/GitHub-Actions/.github/actions/check-pull-request-labels@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/check-pull-request-labels@dev
with:
label1: "merge-if-checks-succeed"
label2: "merge-and-resolve-jira-issue-if-checks-succeed"
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/auto-transition-jira-issue/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ runs:
- name: Check if Should Done
id: check-done
uses: Lombiq/GitHub-Actions/.github/actions/check-pull-request-labels@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/check-pull-request-labels@dev
with:
label1: "done-jira-issue-if-checks-succeed"
label2: "dummy"

- name: Check if Should Resolve
id: check-resolve
if: steps.check-done.outputs.contains-label == 'false'
uses: Lombiq/GitHub-Actions/.github/actions/check-pull-request-labels@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/check-pull-request-labels@dev
with:
label1: "resolve-jira-issue-if-checks-succeed"
label2: "merge-and-resolve-jira-issue-if-checks-succeed"
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/precompile-orchard1-app/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ runs:
path: ${{ inputs.checkout-path }}

- name: Enable Node corepack
uses: Lombiq/GitHub-Actions/.github/actions/enable-corepack@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/enable-corepack@dev

# Calling nuget restore separately on the actual solution, because we're passing Orchard.proj to the msbuild action
# instead to be able to call the Precompiled target on it.
Expand All @@ -73,7 +73,7 @@ runs:
run: nuget restore ${{ inputs.checkout-path }}/${{ inputs.solution-path }}

- name: Publish Precompiled app
uses: Lombiq/GitHub-Actions/.github/actions/msbuild@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/msbuild@dev
with:
directory: ${{ inputs.checkout-path }}
verbosity: ${{ inputs.verbosity }}
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/publish-nuget/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ runs:
run: Update-ManifestVersion './' '${{ steps.setup.outputs.publish-version }}'

- name: Enable Node corepack
uses: Lombiq/GitHub-Actions/.github/actions/enable-corepack@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/enable-corepack@dev

- name: Install dependencies
shell: pwsh
Expand All @@ -122,7 +122,7 @@ runs:
run: ./ConvertTo-Nuspec.ps1 '${{ steps.setup.outputs.publish-version }}'

- name: Build
uses: Lombiq/GitHub-Actions/.github/actions/build-dotnet@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/build-dotnet@dev
# Notes on the configuration:
# * -p:NuGetBuild=true is our property to load Lombiq dependencies from NuGet by switching project references
# to package references.
Expand Down Expand Up @@ -213,7 +213,7 @@ runs:
retention-days: ${{ inputs.nuget-artifact-retention-days }}

- name: Create Release
uses: Lombiq/GitHub-Actions/.github/actions/release-action@v0.1-735
uses: Lombiq/GitHub-Actions/.github/actions/release-action@issue/OSOE-735
# This is to prevent creating releases when pushing tags for issue-specific pre-releases like
# v4.3.1-alpha.osoe-86.
if: "!contains(steps.setup.outputs.publish-version, '-')"
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/spelling/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ runs:
shell: pwsh
run: |
$defaultPrefixes = @{
'lombiq-lgha' = 'https://raw.githubusercontent.com/Lombiq/GitHub-Actions/v0.1/.github/actions/spelling/'
'lombiq-lgha' = 'https://raw.githubusercontent.com/Lombiq/GitHub-Actions/dev/.github/actions/spelling/'
'cspell' = 'https://raw.githubusercontent.com/check-spelling/cspell-dicts/v20230509/dictionaries/'
}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/test-dotnet/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ runs:
"Lombiq_Tests_UI__OrchardCoreUITestExecutorConfiguration__MaxParallelTests=${{ inputs.ui-test-parallelism }}" >> $Env:GITHUB_ENV
- name: Install dotnet-dump
uses: Lombiq/GitHub-Actions/.github/actions/install-dotnet-tool@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/install-dotnet-tool@dev
with:
name: dotnet-dump
version: 8.0.510501
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/verify-dotnet-consolidation/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ runs:
using: "composite"
steps:
- name: Install dotnet-consolidate
uses: Lombiq/GitHub-Actions/.github/actions/install-dotnet-tool@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/install-dotnet-tool@dev
with:
name: dotnet-consolidate
version: 4.2.0
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build-and-test-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,24 +177,24 @@ jobs:
cancel-in-progress: ${{ inputs.cancel-in-progress-for-this-pr == 'true' }}
steps:
- name: Checkout
uses: Lombiq/GitHub-Actions/.github/actions/checkout@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/checkout@dev
with:
token: ${{ secrets.CHECKOUT_TOKEN }}

- name: Set up .NET
uses: Lombiq/GitHub-Actions/.github/actions/setup-dotnet@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/setup-dotnet@dev
with:
dotnet-version: ${{ inputs.dotnet-version }}

- name: Verify that .NET packages are consolidated
if: ${{ inputs.verify-dotnet-consolidation }}
uses: Lombiq/GitHub-Actions/.github/actions/verify-dotnet-consolidation@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/verify-dotnet-consolidation@dev
with:
directory: ${{ inputs.build-directory }}
exclude-version-regex: ${{ inputs.dotnet-consolidation-exclude-version-regex }}

- name: Build and Static Code Analysis
uses: Lombiq/GitHub-Actions/.github/actions/build-dotnet@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/build-dotnet@dev
with:
directory: ${{ inputs.build-directory}}
configuration: ${{ inputs.build-configuration}}
Expand All @@ -210,7 +210,7 @@ jobs:

- name: Tests
if: inputs.test-disable == 'false'
uses: Lombiq/GitHub-Actions/.github/actions/test-dotnet@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/test-dotnet@dev
with:
blame-hang-timeout: ${{ inputs.blame-hang-timeout }}
build-directory: ${{ inputs.build-directory }}
Expand All @@ -222,6 +222,6 @@ jobs:

- name: Cancel Workflow on Failure
if: failure() && inputs.cancel-workflow-on-failure == 'true'
uses: Lombiq/GitHub-Actions/.github/actions/cancel-workflow@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/cancel-workflow@dev
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
20 changes: 10 additions & 10 deletions .github/workflows/build-and-test-orchard-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -200,27 +200,27 @@ jobs:
cancel-in-progress: ${{ inputs.cancel-in-progress-for-this-pr == 'true' }}
steps:
- name: Checkout
uses: Lombiq/GitHub-Actions/.github/actions/checkout@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/checkout@dev
with:
token: ${{ secrets.CHECKOUT_TOKEN }}

- name: Set up .NET
uses: Lombiq/GitHub-Actions/.github/actions/setup-dotnet@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/setup-dotnet@dev
with:
dotnet-version: ${{ inputs.dotnet-version }}

- name: Verify that .NET packages are consolidated
if: ${{ inputs.verify-dotnet-consolidation }}
uses: Lombiq/GitHub-Actions/.github/actions/verify-dotnet-consolidation@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/verify-dotnet-consolidation@dev
with:
directory: ${{ inputs.build-directory }}
exclude-version-regex: ${{ inputs.dotnet-consolidation-exclude-version-regex }}

- name: Enable Node.js corepack
uses: Lombiq/GitHub-Actions/.github/actions/enable-corepack@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/enable-corepack@dev

- name: Build and Static Code Analysis
uses: Lombiq/GitHub-Actions/.github/actions/build-dotnet@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/build-dotnet@dev
with:
directory: ${{ inputs.build-directory }}
configuration: ${{ inputs.build-configuration}}
Expand All @@ -236,21 +236,21 @@ jobs:

- name: Print configuration summary
if: inputs.print-config-summary == 'true' && (success() || failure())
uses: Lombiq/GitHub-Actions/.github/actions/print-config-summary@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/print-config-summary@dev

- name: Set up SQL Server
if: inputs.set-up-sql-server == 'true'
uses: Lombiq/GitHub-Actions/.github/actions/setup-sql-server@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/setup-sql-server@dev

- name: Set up Azurite
if: inputs.set-up-azurite == 'true'
uses: Lombiq/GitHub-Actions/.github/actions/setup-azurite@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/setup-azurite@dev
with:
location: ${{ inputs.build-directory}}

- name: Tests
if: inputs.test-disable == 'false'
uses: Lombiq/GitHub-Actions/.github/actions/test-dotnet@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/test-dotnet@dev
with:
blame-hang-timeout: ${{ inputs.blame-hang-timeout }}
build-directory: ${{ inputs.build-directory }}
Expand All @@ -264,6 +264,6 @@ jobs:

- name: Cancel Workflow on Failure
if: failure() && inputs.cancel-workflow-on-failure == 'true'
uses: Lombiq/GitHub-Actions/.github/actions/cancel-workflow@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/cancel-workflow@dev
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
10 changes: 5 additions & 5 deletions .github/workflows/build-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,23 +88,23 @@ jobs:
Write-Output '::warning::This workflow is deprecated. Use build-and-test-dotnet instead, that can also execute tests.'
- name: Checkout
uses: Lombiq/GitHub-Actions/.github/actions/checkout@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/checkout@dev
with:
token: ${{ secrets.CHECKOUT_TOKEN }}

- name: Set up .NET
uses: Lombiq/GitHub-Actions/.github/actions/setup-dotnet@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/setup-dotnet@dev
with:
dotnet-version: ${{ inputs.dotnet-version }}

- name: Verify that .NET packages are consolidated
if: ${{ inputs.verify-dotnet-consolidation }}
uses: Lombiq/GitHub-Actions/.github/actions/verify-dotnet-consolidation@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/verify-dotnet-consolidation@dev
with:
directory: ${{ inputs.build-directory }}

- name: Build and Static Code Analysis
uses: Lombiq/GitHub-Actions/.github/actions/build-dotnet@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/build-dotnet@dev
with:
directory: ${{ inputs.build-directory}}
verbosity: ${{ inputs.build-verbosity}}
Expand All @@ -115,6 +115,6 @@ jobs:

- name: Cancel Workflow on Failure
if: failure() && inputs.cancel-workflow-on-failure == 'true'
uses: Lombiq/GitHub-Actions/.github/actions/cancel-workflow@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/cancel-workflow@dev
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
create-jira-issues-for-community-activities:
name: Create Jira issues for community activities
uses: Lombiq/GitHub-Actions/.github/workflows/create-jira-issues-for-community-activities.yml@v0.1
uses: Lombiq/GitHub-Actions/.github/workflows/create-jira-issues-for-community-activities.yml@dev
secrets:
JIRA_BASE_URL: ${{ secrets.DEFAULT_JIRA_BASE_URL }}
JIRA_USER_EMAIL: ${{ secrets.DEFAULT_JIRA_USER_EMAIL }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
timeout-minutes: ${{ inputs.timeout-minutes }}
steps:
- name: Create Jira issues for community activities
uses: Lombiq/GitHub-Actions/.github/actions/create-jira-issues-for-community-activities@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/create-jira-issues-for-community-activities@dev
env:
JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/deploy-orchard1-to-azure-app-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,20 +122,20 @@ jobs:
timeout-minutes: ${{ inputs.timeout-minutes }}
steps:
- name: Checkout
uses: Lombiq/GitHub-Actions/.github/actions/checkout@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/checkout@dev
with:
token: ${{ secrets.CHECKOUT_TOKEN }}

- name: Enable Node corepack
uses: Lombiq/GitHub-Actions/.github/actions/enable-corepack@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/enable-corepack@dev

# Calling nuget restore separately on the actual solution, because we're passing Orchard.proj to the msbuild
# action instead to be able to call the Precompiled target.
- name: Restore NuGet packages
run: nuget restore ${{ inputs.build-directory }}\${{ inputs.solution-or-project-path }}

- name: Publish Precompiled App
uses: Lombiq/GitHub-Actions/.github/actions/msbuild@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/msbuild@dev
with:
solution-or-project-path: Orchard.proj
verbosity: ${{ inputs.build-verbosity }}
Expand All @@ -146,7 +146,7 @@ jobs:
/p:Solution=${{ inputs.build-directory }}\${{ inputs.solution-or-project-path }}
- name: Login to Azure
uses: Lombiq/GitHub-Actions/.github/actions/login-to-azure@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/login-to-azure@dev
env:
AZURE_CLIENT_ID: ${{ secrets.AZURE_APP_SERVICE_DEPLOYMENT_SERVICE_PRINCIPAL_ID }}
AZURE_TENANT_ID: ${{ secrets.AZURE_APP_SERVICE_DEPLOYMENT_AZURE_TENANT_ID }}
Expand Down Expand Up @@ -177,7 +177,7 @@ jobs:

- name: Add Azure Application Insights Release Annotation
if: ${{ inputs.application-insights-resource-id != '' }}
uses: Lombiq/GitHub-Actions/.github/actions/add-azure-application-insights-release-annotation@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/add-azure-application-insights-release-annotation@dev
with:
release-name: 'Deploy #${{ github.run_number }} to ${{ inputs.slot-name }}'
application-insights-resource-id: ${{ inputs.application-insights-resource-id }}
Expand Down Expand Up @@ -210,6 +210,6 @@ jobs:
- name: Cancel Workflow on Failure
if: failure() && inputs.cancel-workflow-on-failure == 'true'
uses: Lombiq/GitHub-Actions/.github/actions/cancel-workflow@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/cancel-workflow@dev
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
14 changes: 7 additions & 7 deletions .github/workflows/deploy-to-azure-app-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,17 +144,17 @@ jobs:
timeout-minutes: ${{ inputs.timeout-minutes }}
steps:
- name: Checkout
uses: Lombiq/GitHub-Actions/.github/actions/checkout@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/checkout@dev
with:
token: ${{ secrets.CHECKOUT_TOKEN }}

- name: Set up .NET
uses: Lombiq/GitHub-Actions/.github/actions/setup-dotnet@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/setup-dotnet@dev
with:
dotnet-version: ${{ inputs.dotnet-version }}

- name: Enable Node corepack
uses: Lombiq/GitHub-Actions/.github/actions/enable-corepack@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/enable-corepack@dev

# If runtime is defined, we need to add "--runtime=" to the string so it will be a valid build/publish option. The
# "build-dotnet" action requires the additional switches to be in separate lines (even the parameters), but we can
Expand All @@ -166,7 +166,7 @@ jobs:
"runtime-option=--runtime=${{ inputs.runtime }}" >> $Env:GITHUB_OUTPUT
- name: Build and Static Code Analysis
uses: Lombiq/GitHub-Actions/.github/actions/build-dotnet@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/build-dotnet@dev
with:
directory: ${{ inputs.build-directory }}
verbosity: ${{ inputs.build-verbosity }}
Expand Down Expand Up @@ -195,7 +195,7 @@ jobs:
${{ steps.set-up-runtime-option.outputs.runtime-option }}
- name: Login to Azure
uses: Lombiq/GitHub-Actions/.github/actions/login-to-azure@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/login-to-azure@dev
env:
AZURE_CLIENT_ID: ${{ secrets.AZURE_APP_SERVICE_DEPLOYMENT_SERVICE_PRINCIPAL_ID }}
AZURE_TENANT_ID: ${{ secrets.AZURE_APP_SERVICE_DEPLOYMENT_AZURE_TENANT_ID }}
Expand All @@ -220,7 +220,7 @@ jobs:
package: ${{ inputs.build-directory }}/Published

- name: Add Azure Application Insights Release Annotation
uses: Lombiq/GitHub-Actions/.github/actions/add-azure-application-insights-release-annotation@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/add-azure-application-insights-release-annotation@dev
with:
release-name: 'Deploy #${{ github.run_number }} to ${{ inputs.slot-name }}'
application-insights-resource-id: ${{ inputs.application-insights-resource-id }}
Expand All @@ -241,6 +241,6 @@ jobs:
- name: Cancel Workflow on Failure
if: failure() && inputs.cancel-workflow-on-failure == 'true'
uses: Lombiq/GitHub-Actions/.github/actions/cancel-workflow@v0.1
uses: Lombiq/GitHub-Actions/.github/actions/cancel-workflow@dev
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Loading

0 comments on commit 12d3892

Please sign in to comment.