Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.1.0 Release #13

Merged
merged 1 commit into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
"commands": [
"docfx"
]
},
"DocFxTocGenerator": {
"version": "1.18.0",
"commands": [
"DocFxTocGenerator"
]
}
}
}
8 changes: 4 additions & 4 deletions .github/actions/setup-dotnet/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ runs:
using: "composite"
steps:
- name: nuget Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
restore-keys: |
${{ runner.os }}-nuget-
- name: Setup .NET 6.0
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
- name: Setup .NET 7.0
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
- name: Setup .NET 8.0
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
10 changes: 5 additions & 5 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
steps:
- name: Create Release
id: create-release
uses: actions/github-script@v6
uses: actions/github-script@v7
env:
RELEASE_VERSION: ${{ inputs.release-version }}
IS_PRERELEASE: ${{ inputs.is-pre-release }}
Expand All @@ -48,21 +48,21 @@ jobs:
})

return createReleaseResponse.data.id
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: docs
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: nuget-package
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: pypi-package
- name: Generate Bundle
run: |
zip -r bundle.zip ./Tableau.Migration.${{ inputs.release-version }}.nupkg docs.zip tableau_migration-pypi.zip
- name: Upload Release Assets
id: upload-docs
uses: actions/github-script@v6
uses: actions/github-script@v7
env:
RELEASE_VERSION: ${{ inputs.release-version }}
RELEASE_ID: ${{ steps.create-release.outputs.result }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/dotnet-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
runs-on: ${{ matrix.os }}
name: .Net Build ${{ matrix.os }}, ${{ matrix.config }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-dotnet
- name: Set Replaced Version Windows
if: ${{ runner.os == 'Windows' && inputs.beta-version != '' }}
run: echo "VERSION_REPLACE_ARGS=-p:Version='${{ inputs.beta-version }}'" | Out-File -FilePath $env:GITHUB_ENV -Append # no need for -Encoding utf8- uses: actions/checkout@v3
run: echo "VERSION_REPLACE_ARGS=-p:Version='${{ inputs.beta-version }}'" | Out-File -FilePath $env:GITHUB_ENV -Append # no need for -Encoding utf8
- name: Set Replaced Version Not Windows
if: ${{ runner.os != 'Windows' && inputs.beta-version != '' }}
run: echo "VERSION_REPLACE_ARGS=-p:Version='${{ inputs.beta-version }}'" >> $GITHUB_ENV
Expand All @@ -43,25 +43,25 @@ jobs:
if: ${{ matrix.os == vars.PUBLISH_OS && matrix.config == 'Release' }}
run: dotnet publish --no-build -p:DebugType=None -p:DebugSymbols=false -c ${{ matrix.config }} -f ${{ vars.PYTHON_NETPACKAGE_FRAMEWORK }} -o './dist/testcomponents/' './tests/Tableau.Migration.TestComponents/Tableau.Migration.TestComponents.csproj'
- name: Upload Published Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ matrix.os == vars.PUBLISH_OS && matrix.config == 'Release' }}
with:
name: published-${{ matrix.config }}
path: './src/Python/src/tableau_migration/bin/**'
- name: Upload Tests Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ matrix.os == vars.PUBLISH_OS && matrix.config == 'Release' }}
with:
name: tests-published-${{ matrix.config }}
path: './dist/tests/**'
- name: Upload TestComponents Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ matrix.os == vars.PUBLISH_OS && matrix.config == 'Release' }}
with:
name: testcomponents-published-${{ matrix.config }}
path: './dist/testcomponents/**'
- name: Upload Nupkg Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ matrix.os == vars.PUBLISH_OS && matrix.config == 'Release' }}
with:
name: nuget-package
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dotnet-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ jobs:
runs-on: ${{ inputs.runs-on-config }}
name: Publish Package from ${{ inputs.published-os }} with ${{ inputs.build-config }} configuration
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
if: ${{ env.PUBLISH_PACKAGE_KEY != '' }}
- uses: ./.github/actions/setup-dotnet
if: ${{ env.PUBLISH_PACKAGE_KEY != '' && inputs.runs-on-config != 'self-hosted' }}
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
if: ${{ env.PUBLISH_PACKAGE_KEY != '' }}
with:
name: nuget-package
Expand Down
16 changes: 6 additions & 10 deletions .github/workflows/dotnet-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,18 @@ jobs:
runs-on: ${{ matrix.os }}
name: .Net Test ${{ matrix.os }}, ${{ matrix.config }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-dotnet
- name: Test ${{ matrix.config }}
- name: Build solution with ${{ matrix.config }} configuration
run: dotnet build '${{ vars.BUILD_SOLUTION }}' -c ${{ matrix.config }}
- name: Test solution with ${{ matrix.config }} configuration
run: |
dotnet test '${{ vars.BUILD_SOLUTION }}' -c ${{ matrix.config }} -p:CollectCoverage=true -p:CoverletOutputFormat=cobertura -p:CoverletOutput=./artifacts/ --verbosity normal --logger trx --results-directory "TestResults-${{ matrix.os }}-${{ matrix.config }}"
dotnet test '${{ vars.BUILD_SOLUTION }}' --no-build -c ${{ matrix.config }} --verbosity normal --logger trx --results-directory "TestResults-${{ matrix.os }}-${{ matrix.config }}" -- RunConfiguration.TestSessionTimeout=${{ vars.MIGRATIONSDK_TEST_CANCELLATION_TIMEOUT_MILLISECONDS }}
- name: Upload test results
# Use always() to always run this step to publish test results when there are test failures
if: ${{ always() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: dotnet-results-${{ matrix.os }}-${{ matrix.config }}
path: TestResults-${{ matrix.os }}-${{ matrix.config }}
if-no-files-found: error
- name: Upload Code Coverage
uses: actions/upload-artifact@v3
with:
name: coverage-${{ matrix.os }}-${{ matrix.config }}
path: '**/artifacts/coverage*.cobertura.xml'
if-no-files-found: error
7 changes: 2 additions & 5 deletions .github/workflows/publishdocs-dryrun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,8 @@ jobs:
runs-on: ${{ inputs.runs-on-config }}
name: Publish docs - Dry-Run
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-dotnet
- uses: actions/download-artifact@v3
with:
name: coverage-${{ inputs.runs-on-config }}-${{ inputs.build-config }}
- name: Set up Python
uses: actions/setup-python@v4
with:
Expand All @@ -35,7 +32,7 @@ jobs:
./scripts/generate-docs.ps1 -SkipPreClean
Compress-Archive ./docs/* -Destination docs.zip
- name: Upload Docs Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: docs
path: docs.zip
9 changes: 3 additions & 6 deletions .github/workflows/publishdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,8 @@ jobs:
runs-on: ${{ inputs.runs-on-config }}
name: Publish docs
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-dotnet
- uses: actions/download-artifact@v3
with:
name: coverage-${{ inputs.runs-on-config }}-${{ inputs.build-config }}
- name: Set up Python
uses: actions/setup-python@v4
with:
Expand All @@ -49,7 +46,7 @@ jobs:
./scripts/generate-docs.ps1 -SkipPreClean
Compress-Archive ./docs/* -Destination docs.zip
- name: Upload Docs Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: docs
path: docs.zip
Expand All @@ -61,4 +58,4 @@ jobs:
path: './docs'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/[email protected].4
uses: actions/[email protected].5
6 changes: 3 additions & 3 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
runs-on: ${{ inputs.runs-on-config }}
name: Publish Package with ${{ inputs.build-config }} configuration
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
if: ${{ env.PUBLISH_PACKAGE_KEY != '' }}
- uses: ./.github/actions/setup-dotnet
if: ${{ env.PUBLISH_PACKAGE_KEY != '' && inputs.runs-on-config != 'self-hosted' }}
Expand All @@ -59,7 +59,7 @@ jobs:
run: |
# default set of ruff rules with GitHub Annotations
python -m hatch run lint:lint
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
if: ${{ env.PUBLISH_PACKAGE_KEY != '' }}
with:
name: published-${{ inputs.build-config }}
Expand All @@ -83,7 +83,7 @@ jobs:
python -m twine upload --repository-url ${{ vars.PYPI_PACKAGE_REPOSITORY_URL }} dist/*
Compress-Archive -Path .\dist\* -DestinationPath .\tableau_migration-pypi.zip
- name: Upload Pypi Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ env.PUBLISH_PACKAGE_KEY != '' && inputs.publish-artifact }}
with:
name: pypi-package
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/python-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ${{ matrix.os }}
name: Test on ${{ matrix.os }}, ${{ matrix.config }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-dotnet
- name: Set up Python
uses: actions/setup-python@v4
Expand All @@ -30,11 +30,11 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install hatch
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: tests-published-${{ matrix.config }}
path: ./src/Python/src/tableau_migration/bin/
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: testcomponents-published-${{ matrix.config }}
path: ./tests/Python.TestApplication/bin/
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/sdk-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ on:
- '**/.gitignore'
- 'CODEOWNERS'
pull_request:
branches:
- main
- 'release/**'
# The default trigger for Pull Requests are:
# - opened
# - synchronize
Expand Down Expand Up @@ -56,7 +53,7 @@ jobs:
code-version: ${{ steps.get-version.outputs.codeversion }}
if: github.event.pull_request.draft == false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set Beta Version
id: set-beta-version
if: ${{ inputs.publish-release != 'Prod' && inputs.publish-release != 'Prod-Internal' }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ cython_debug/
# Other stuff
UpgradeLog.htm
appsettings.Development.json
clean-server-settings.dev.json
launchSettings.json
UpgradeLog.htm
*.DEV.ini
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<Version>2.0.0</Version>
<Version>2.1.0</Version>
<Authors>Tableau Software, LLC</Authors>
<Company>Tableau Software, LLC</Company>
<Copyright>Copyright (c) 2024, Tableau Software, LLC and its licensors</Copyright>
Expand Down
Loading
Loading