Skip to content

Commit 49b58d2

Browse files
committed
Revert Bump Fusion to version 2.5
This reverts commit a7f09ae. Signed-off-by: Paolo Di Tommaso <[email protected]>
1 parent 60f1d1f commit 49b58d2

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

modules/nextflow/src/main/groovy/nextflow/fusion/FusionConfig.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ import nextflow.util.MemoryUnit
3434
@CompileStatic
3535
class FusionConfig {
3636

37-
final static public String DEFAULT_FUSION_AMD64_URL = 'https://fusionfs.seqera.io/releases/v2.5-amd64.json'
38-
final static public String DEFAULT_FUSION_ARM64_URL = 'https://fusionfs.seqera.io/releases/v2.5-arm64.json'
37+
final static public String DEFAULT_FUSION_AMD64_URL = 'https://fusionfs.seqera.io/releases/v2.4-amd64.json'
38+
final static public String DEFAULT_FUSION_ARM64_URL = 'https://fusionfs.seqera.io/releases/v2.4-arm64.json'
3939
final static public String DEFAULT_TAGS = "[.command.*|.exitcode|.fusion.*](nextflow.io/metadata=true),[*](nextflow.io/temporary=true)"
4040

4141
final static public String FUSION_PATH = '/usr/bin/fusion'

modules/nextflow/src/test/groovy/nextflow/fusion/FusionConfigTest.groovy

+3-3
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ class FusionConfigTest extends Specification {
136136
new FusionConfig([:]).retrieveFusionVersion(FUSION_URL) == EXPECTED
137137
where:
138138
FUSION_URL | EXPECTED
139-
FusionConfig.DEFAULT_FUSION_AMD64_URL | '2.5'
140-
FusionConfig.DEFAULT_FUSION_ARM64_URL | '2.5'
139+
FusionConfig.DEFAULT_FUSION_AMD64_URL | '2.4'
140+
FusionConfig.DEFAULT_FUSION_ARM64_URL | '2.4'
141141
'https://foo.com/releases/v3.0-amd.json'| '3.0'
142142
}
143143

@@ -147,7 +147,7 @@ class FusionConfigTest extends Specification {
147147
where:
148148
FUSION_URL | ENABLED | EXPECTED
149149
null | false | null
150-
null | true | '2.5'
150+
null | true | '2.4'
151151
'https://foo.com/releases/v4.0-amd64.json' | true | '4.0'
152152
'https://foo.com/releases/v4.0.1-amd64.json' | true | '4.0.1'
153153
}

modules/nextflow/src/test/groovy/nextflow/script/FusionMetaTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class FusionMetaTest extends Specification {
4040
OPTS | EXPECTED_ENABLED | EXPECTED_VERSION
4141
[:] | false | null
4242
[fusion:[enabled:false]] | false | null
43-
[fusion:[enabled:true]] | true | '2.5'
43+
[fusion:[enabled:true]] | true | '2.4'
4444
[fusion:[enabled:true, containerConfigUrl: 'https://foo.io/releases/v3.0-amd64.json']] | true | '3.0'
4545
}
4646

plugins/nf-wave/src/test/io/seqera/wave/plugin/WaveClientTest.groovy

+5-5
Original file line numberDiff line numberDiff line change
@@ -957,11 +957,11 @@ class WaveClientTest extends Specification {
957957

958958
where:
959959
ARCH | EXPECTED
960-
'linux/amd64' | 'https://fusionfs.seqera.io/releases/v2.5-amd64.json'
961-
'linux/x86_64' | 'https://fusionfs.seqera.io/releases/v2.5-amd64.json'
962-
'arm64' | 'https://fusionfs.seqera.io/releases/v2.5-arm64.json'
963-
'linux/arm64' | 'https://fusionfs.seqera.io/releases/v2.5-arm64.json'
964-
'linux/arm64/v8' | 'https://fusionfs.seqera.io/releases/v2.5-arm64.json'
960+
'linux/amd64' | 'https://fusionfs.seqera.io/releases/v2.4-amd64.json'
961+
'linux/x86_64' | 'https://fusionfs.seqera.io/releases/v2.4-amd64.json'
962+
'arm64' | 'https://fusionfs.seqera.io/releases/v2.4-arm64.json'
963+
'linux/arm64' | 'https://fusionfs.seqera.io/releases/v2.4-arm64.json'
964+
'linux/arm64/v8' | 'https://fusionfs.seqera.io/releases/v2.4-arm64.json'
965965
}
966966

967967
@Unroll

0 commit comments

Comments
 (0)