Skip to content

Commit e845b47

Browse files
committed
Ok, try removing net6
1 parent 2dbf9b6 commit e845b47

File tree

1 file changed

+33
-35
lines changed

1 file changed

+33
-35
lines changed

.github/workflows/ci.yml

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
matrix:
4141
arch: [ x64 ]
4242
os: [ windows-2022, macos-latest ]
43-
tfm: [ net472, net6.0, net8.0, net9.0 ]
43+
tfm: [ net472, net8.0, net9.0 ]
4444
exclude:
4545
- os: macos-latest
4646
tfm: net472
@@ -66,43 +66,41 @@ jobs:
6666
6.0.x
6767
- name: Run ${{ matrix.tfm }} tests
6868
run: dotnet test LibGit2Sharp.sln --configuration Release --framework ${{ matrix.tfm }} --logger "GitHubActions" /p:ExtraDefine=LEAKS_IDENTIFYING
69-
# test-linux:
70-
# name: Test / ${{ matrix.distro }} / ${{ matrix.arch }} / ${{ matrix.tfm }}
71-
# runs-on: ${{ matrix.arch == 'amd64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }}
72-
# strategy:
73-
# matrix:
74-
# arch: [ amd64, arm64 ]
75-
# distro: [ alpine.3.17, alpine.3.18, alpine.3.19, alpine.3.20, centos.stream.9, debian.12, fedora.40, ubuntu.20.04, ubuntu.22.04, ubuntu.24.04 ]
76-
# sdk: [ '8.0', '9.0' ]
77-
# exclude:
78-
# - distro: alpine.3.17
79-
# sdk: '9.0'
80-
# - distro: alpine.3.18
81-
# sdk: '9.0'
82-
# - distro: alpine.3.19
83-
# sdk: '9.0'
84-
# include:
85-
# - sdk: '6.0'
86-
# tfm: net6.0
87-
# - sdk: '8.0'
88-
# tfm: net8.0
89-
# - sdk: '9.0'
90-
# tfm: net9.0
91-
# fail-fast: false
92-
# steps:
93-
# - name: Checkout
94-
# uses: actions/[email protected]
95-
# with:
96-
# fetch-depth: 0
97-
# - name: Run ${{ matrix.tfm }} tests
98-
# run: |
99-
# git_command="git config --global --add safe.directory /app"
100-
# test_command="dotnet test LibGit2Sharp.sln --configuration Release -p:TargetFrameworks=${{ matrix.tfm }} --logger "GitHubActions" -p:ExtraDefine=LEAKS_IDENTIFYING"
101-
# docker run -t --rm --platform linux/${{ matrix.arch }} -v "$PWD:/app" -e OPENSSL_ENABLE_SHA1_SIGNATURES=1 gittools/build-images:${{ matrix.distro }}-sdk-${{ matrix.sdk }} sh -c "$git_command && $test_command"
69+
test-linux:
70+
name: Test / ${{ matrix.distro }} / ${{ matrix.arch }} / ${{ matrix.tfm }}
71+
runs-on: ${{ matrix.arch == 'amd64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }}
72+
strategy:
73+
matrix:
74+
arch: [ amd64, arm64 ]
75+
distro: [ alpine.3.17, alpine.3.18, alpine.3.19, alpine.3.20, centos.stream.9, debian.12, fedora.40, ubuntu.20.04, ubuntu.22.04, ubuntu.24.04 ]
76+
sdk: [ '8.0', '9.0' ]
77+
exclude:
78+
- distro: alpine.3.17
79+
sdk: '9.0'
80+
- distro: alpine.3.18
81+
sdk: '9.0'
82+
- distro: alpine.3.19
83+
sdk: '9.0'
84+
include:
85+
- sdk: '8.0'
86+
tfm: net8.0
87+
- sdk: '9.0'
88+
tfm: net9.0
89+
fail-fast: false
90+
steps:
91+
- name: Checkout
92+
uses: actions/[email protected]
93+
with:
94+
fetch-depth: 0
95+
- name: Run ${{ matrix.tfm }} tests
96+
run: |
97+
git_command="git config --global --add safe.directory /app"
98+
test_command="dotnet test LibGit2Sharp.sln --configuration Release -p:TargetFrameworks=${{ matrix.tfm }} --logger "GitHubActions" -p:ExtraDefine=LEAKS_IDENTIFYING"
99+
docker run -t --rm --platform linux/${{ matrix.arch }} -v "$PWD:/app" -e OPENSSL_ENABLE_SHA1_SIGNATURES=1 gittools/build-images:${{ matrix.distro }}-sdk-${{ matrix.sdk }} sh -c "$git_command && $test_command"
102100
103101
nuget-push:
104102
name: Octopus NuGet Push
105-
needs: [build, test] #, test-linux
103+
needs: [build, test, test-linux] #
106104
# && github.ref == 'refs/heads/octopus/master'
107105
if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]' && github.event_name != 'schedule'
108106
runs-on: ubuntu-22.04

0 commit comments

Comments
 (0)