Skip to content

Commit

Permalink
Fix/lint errors (#443)
Browse files Browse the repository at this point in the history
<!--- Provide a general summary of your changes in the Title above that
includes the Jira Ticket -->

# Description
<!--- Describe your changes in detail -->

# Related Issue\Feature
<!--- Please link to the issue or feature: -->

# How Has This Been Tested
- [ ] All unit tests pass.
- [ ] All integration tests pass.
- [ ] Manual Testing:
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

# Types of changes
<!--- What types of changes does your code introduce? Put an 'x' in all
the boxes that apply: -->
<!-- Note that you can just click these after submission and it will
remember the tick for you -->
- [ ] Docs change
- [ ] Refactoring
- [ ] Dependency upgrade
- [ ] Additional Unit Tests\Integration Tests
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] Removed no-longer used code

## Deployment Configuration Changes
- [ ] Requires deployment configuration changes as specified below and
in CHANGELOG.md
<!--- Insert Deployment configuration changes here -->

# Checklist
<!--- Go over all the following points, and put an 'x' in all the boxes
once they are true. -->
<!-- Note that you can just click these after submission and it will
remember the tick for you -->
- [ ] There are no Resharper\static code analysis errors anywhere in the
solution.
- [ ] I have ONLY run a code clean-up on any files I have modified to
make sure they are in the correct format and no others.
- [ ] I have added tests to cover my changes.
- [ ] I have run the code and quickly verified it all works to my
satisfaction.
- [ ] All new/modified code has sufficient logging to be able to
diagnose what is wrong.
- [ ] All new and existing tests passed.
- [ ] All new/modified public interfaces/classes have are documented
with xmldoc comments.
- [ ] Unreleased section of CHANGELOG.md has been updated with details
of this PR.
  • Loading branch information
credfeto authored May 23, 2024
2 parents 2b9e7d9 + 8beefb9 commit 6b50c9d
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 23 deletions.
47 changes: 35 additions & 12 deletions .github/workflows/build-and-publish-pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,29 +91,52 @@ jobs:
core.info('Name: ${{runner.name}}');
core.info('OS: ${{runner.os}}');
- name: "Enable Local nuget feeds if caching"
- name: "Build and deploy"
if: startsWith(runner.name, 'buildagent-')
id: nuget-local-cache
shell: bash
run: |
{
echo "NUGET_BAGET_CACHE=${{vars.NUGET_BAGET_CACHE}}"
echo "PRERELEASE_BAGET_CACHE=${{vars.PRERELEASE_BAGET_CACHE}}"
echo "RELEASE_BAGET_CACHE=${{vars.RELEASE_BAGET_CACHE}}"
}>> "$GITHUB_OUTPUT"
uses: ./.github/actions/build
with:
PRODUCTION_BUILD: False
NPM_PRODUCTION_PACKAGER_VERSION: ${{vars.PRODUCTION_PACKAGER_VERSION}}
NPM_CONTENT_PACKAGE_WALLET_PASSWORD: ${{secrets.CONTENT_PACKAGE_WALLET_PASSWORD}}
NPM_PACKAGE_STORE_SIGNING_WALLET: ${{secrets.PACKAGE_STORE_SIGNING_WALLET}}
NPM_PACKAGE_STORE_SIGNING_WALLET_PASSWORD: ${{secrets.PACKAGE_STORE_SIGNING_WALLET_PASSWORD}}
NUGET_PUBLIC_RESTORE_FEED_CACHE: ${{vars.NUGET_BAGET_CACHE}}
NUGET_PUBLIC_RESTORE_FEED: ${{vars.NUGET_PUBLIC_RESTORE_FEED}}
NUGET_ADDITIONAL_RESTORE_FEED_RELEASE_CACHE: ${{vars.RELEASE_BAGET_CACHE}}
NUGET_ADDITIONAL_RESTORE_FEED_PRERELEASE_CACHE: ${{vars.PRERELEASE_BAGET_CACHE}}
NUGET_ADDITIONAL_RESTORE_FEED_RELEASE: ${{vars.NUGET_ADDITIONAL_RESTORE_FEED_RELEASE}}
NUGET_ADDITIONAL_RESTORE_FEED_PRERELEASE: ${{vars.NUGET_ADDITIONAL_RESTORE_FEED_PRERELEASE}}
NUGET_PACK: ${{vars.NUGET_PACK}}
NUGET_FEED: ${{secrets.NUGET_FEED}}
NUGET_SYMBOL_FEED: ${{secrets.NUGET_SYMBOL_FEED}}
NUGET_API_KEY: ${{secrets.NUGET_API_KEY}}
SLEET_CONFIG: ${{secrets.SLEET_CONFIG}}
SLEET_FEED: "dotnet-prerelease"
OCTOPUS_SERVER: ${{vars.OCTOPUS_SERVER}}
OCTOPUS_SPACE_NAME: ${{vars.OCTOPUS_SPACE}}
OCTOPUS_PROJECT: ${{vars.OCTOPUS_PROJECT}}
OCTOPUS_CHANNEL: ${{vars.OCTOPUS_PRERELEASE_CHANNEL}}
OCTOPUS_DEPLOY_TO: ${{vars.OCTOPUS_DEPLOYTO_PRERELEASE}}
OCTOPUS_API_KEY: ${{secrets.OCTOPUS_API_KEY}}
OCTOPUS_DEPLOY_PACKAGE: ${{vars.OCTOPUS_DEPLOY_PACKAGE}}
OCTOPUS_DEPLOY_PACKAGE_ZIP: ${{vars.OCTOPUS_DEPLOY_PACKAGE_ZIP}}
GITHUB_TOKEN: ${{secrets.SOURCE_PUSH_TOKEN}}
REPO_VISIBILITY: ${{env.REPO_STATUS}}
CREATE_RELEASE: false

- name: "Build and deploy"
if: startsWith(runner.name, 'buildagent-') != true
uses: ./.github/actions/build
with:
PRODUCTION_BUILD: False
NPM_PRODUCTION_PACKAGER_VERSION: ${{vars.PRODUCTION_PACKAGER_VERSION}}
NPM_CONTENT_PACKAGE_WALLET_PASSWORD: ${{secrets.CONTENT_PACKAGE_WALLET_PASSWORD}}
NPM_PACKAGE_STORE_SIGNING_WALLET: ${{secrets.PACKAGE_STORE_SIGNING_WALLET}}
NPM_PACKAGE_STORE_SIGNING_WALLET_PASSWORD: ${{secrets.PACKAGE_STORE_SIGNING_WALLET_PASSWORD}}
NUGET_PUBLIC_RESTORE_FEED_CACHE: ${{steps.nuget-local-cache.outputs.NUGET_BAGET_CACHE}}
NUGET_PUBLIC_RESTORE_FEED_CACHE: ""
NUGET_PUBLIC_RESTORE_FEED: ${{vars.NUGET_PUBLIC_RESTORE_FEED}}
NUGET_ADDITIONAL_RESTORE_FEED_RELEASE_CACHE: ${{steps.nuget-local-cache.outputs.RELEASE_BAGET_CACHE}}
NUGET_ADDITIONAL_RESTORE_FEED_PRERELEASE_CACHE: ${{steps.nuget-local-cache.outputs.PRERELEASE_BAGET_CACHE}}
NUGET_ADDITIONAL_RESTORE_FEED_RELEASE_CACHE: ""
NUGET_ADDITIONAL_RESTORE_FEED_PRERELEASE_CACHE: ""
NUGET_ADDITIONAL_RESTORE_FEED_RELEASE: ${{vars.NUGET_ADDITIONAL_RESTORE_FEED_RELEASE}}
NUGET_ADDITIONAL_RESTORE_FEED_PRERELEASE: ${{vars.NUGET_ADDITIONAL_RESTORE_FEED_PRERELEASE}}
NUGET_PACK: ${{vars.NUGET_PACK}}
Expand Down
45 changes: 34 additions & 11 deletions .github/workflows/build-and-publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,28 +87,51 @@ jobs:
core.info('Name: ${{runner.name}}');
core.info('OS: ${{runner.os}}');
- name: "Enable Local nuget feeds if caching"
- name: "Build and deploy"
if: startsWith(runner.name, 'buildagent-')
id: nuget-local-cache
shell: bash
run: |
{
echo "NUGET_BAGET_CACHE=${{vars.NUGET_BAGET_CACHE}}"
echo "PRERELEASE_BAGET_CACHE=${{vars.PRERELEASE_BAGET_CACHE}}"
echo "RELEASE_BAGET_CACHE=${{vars.RELEASE_BAGET_CACHE}}"
}>> "$GITHUB_OUTPUT"
uses: ./.github/actions/build
with:
PRODUCTION_BUILD: True
NPM_PRODUCTION_PACKAGER_VERSION: ${{vars.PRODUCTION_PACKAGER_VERSION}}
NPM_CONTENT_PACKAGE_WALLET_PASSWORD: ${{secrets.CONTENT_PACKAGE_WALLET_PASSWORD}}
NPM_PACKAGE_STORE_SIGNING_WALLET: ${{secrets.PACKAGE_STORE_SIGNING_WALLET}}
NPM_PACKAGE_STORE_SIGNING_WALLET_PASSWORD: ${{secrets.PACKAGE_STORE_SIGNING_WALLET_PASSWORD}}
NUGET_PUBLIC_RESTORE_FEED_CACHE: ${{vars.NUGET_BAGET_CACHE}}
NUGET_PUBLIC_RESTORE_FEED: ${{vars.NUGET_PUBLIC_RESTORE_FEED}}
NUGET_ADDITIONAL_RESTORE_FEED_RELEASE_CACHE: ${{vars.RELEASE_BAGET_CACHE}}
NUGET_ADDITIONAL_RESTORE_FEED_PRERELEASE_CACHE: ""
NUGET_ADDITIONAL_RESTORE_FEED_RELEASE: ${{vars.NUGET_ADDITIONAL_RESTORE_FEED_RELEASE}}
NUGET_ADDITIONAL_RESTORE_FEED_PRERELEASE: ""
NUGET_PACK: ${{vars.NUGET_PACK}}
NUGET_FEED: ${{secrets.NUGET_FEED}}
NUGET_SYMBOL_FEED: ${{secrets.NUGET_SYMBOL_FEED}}
NUGET_API_KEY: ${{secrets.NUGET_API_KEY}}
SLEET_CONFIG: ${{secrets.SLEET_CONFIG}}
SLEET_FEED: "dotnet-release"
OCTOPUS_SERVER: ${{vars.OCTOPUS_SERVER}}
OCTOPUS_SPACE_NAME: ${{vars.OCTOPUS_SPACE}}
OCTOPUS_PROJECT: ${{vars.OCTOPUS_PROJECT}}
OCTOPUS_CHANNEL: ${{vars.OCTOPUS_RELEASE_CHANNEL}}
OCTOPUS_DEPLOY_TO: ${{vars.OCTOPUS_DEPLOYTO_RELEASE}}
OCTOPUS_API_KEY: ${{secrets.OCTOPUS_API_KEY}}
OCTOPUS_DEPLOY_PACKAGE: ${{vars.OCTOPUS_DEPLOY_PACKAGE}}
OCTOPUS_DEPLOY_PACKAGE_ZIP: ${{vars.OCTOPUS_DEPLOY_PACKAGE_ZIP}}
GITHUB_TOKEN: ${{secrets.SOURCE_PUSH_TOKEN}}
REPO_VISIBILITY: ${{env.REPO_STATUS}}
CREATE_RELEASE: true

- name: "Build and deploy"
if: startsWith(runner.name, 'buildagent-') != true
uses: ./.github/actions/build
with:
PRODUCTION_BUILD: True
NPM_PRODUCTION_PACKAGER_VERSION: ${{vars.PRODUCTION_PACKAGER_VERSION}}
NPM_CONTENT_PACKAGE_WALLET_PASSWORD: ${{secrets.CONTENT_PACKAGE_WALLET_PASSWORD}}
NPM_PACKAGE_STORE_SIGNING_WALLET: ${{secrets.PACKAGE_STORE_SIGNING_WALLET}}
NPM_PACKAGE_STORE_SIGNING_WALLET_PASSWORD: ${{secrets.PACKAGE_STORE_SIGNING_WALLET_PASSWORD}}
NUGET_PUBLIC_RESTORE_FEED_CACHE: ${{steps.nuget-local-cache.outputs.NUGET_BAGET_CACHE}}
NUGET_PUBLIC_RESTORE_FEED_CACHE: ${{vars.NUGET_BAGET_CACHE}}
NUGET_PUBLIC_RESTORE_FEED: ${{vars.NUGET_PUBLIC_RESTORE_FEED}}
NUGET_ADDITIONAL_RESTORE_FEED_RELEASE_CACHE: ${{steps.nuget-local-cache.outputs.RELEASE_BAGET_CACHE}}
NUGET_ADDITIONAL_RESTORE_FEED_RELEASE_CACHE: ${{vars.RELEASE_BAGET_CACHE}}
NUGET_ADDITIONAL_RESTORE_FEED_PRERELEASE_CACHE: ""
NUGET_ADDITIONAL_RESTORE_FEED_RELEASE: ${{vars.NUGET_ADDITIONAL_RESTORE_FEED_RELEASE}}
NUGET_ADDITIONAL_RESTORE_FEED_PRERELEASE: ""
Expand Down

0 comments on commit 6b50c9d

Please sign in to comment.