[go: nahoru, domu]
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.

Sign up for GitHub

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

Jump to bottom

Enable multiple git revisions (Jan-Apr 2024) : temporary, using revision name in repo localPath #5087

Open
wants to merge 58 commits into
base: master
Choose a base branch
from
Open

Enable multiple git revisions (Jan-Apr 2024) : temporary, using revision name in repo localPath #5087

Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
7d027ec
Multiple revisions 1st: AssetManager, Cmd Clone Pull Run
marcodelapierre Jan 15, 2024
106e8df
removed revision paramter from clone pull run
marcodelapierre Jan 16, 2024
0a9e6f8
updated unit tests for AssetManager
marcodelapierre Jan 16, 2024
37d332e
Merge branch 'master' into add/mult_revisions
marcodelapierre Jan 16, 2024
5a9b159
AssetManager provider.revision assigned at AssetManager object creation
marcodelapierre Jan 16, 2024
94d34f3
Codespell typo in changelog
marcodelapierre Jan 16, 2024
4744774
AssetManager: removed checkout method
marcodelapierre Jan 16, 2024
d9e7b2b
Merge branch 'master' into add/mult_revisions
marcodelapierre Jan 17, 2024
08718ef
assetmanager: fixed build signature, and unit tests
marcodelapierre Jan 17, 2024
242a600
assetmanager: one more build signature fix
marcodelapierre Jan 17, 2024
35ad1e9
AssetManager: fix for multi revs in find() method
marcodelapierre Jan 17, 2024
463b6f1
Multiple revisions: added for Cmds Drop, View, Config, Info
marcodelapierre Jan 17, 2024
2d3273e
minor fixes to log outputs in CmdRun
marcodelapierre Jan 17, 2024
d2e5ffe
AssetManager: documented new localPath schema
marcodelapierre Jan 18, 2024
60c3c5e
K8sDriverLauncher : added revision support
marcodelapierre Jan 18, 2024
4bf1e37
updates to AssetManagerTest
marcodelapierre Jan 18, 2024
7e32111
edit to AssetManagerTest, git.pull for TAGS does not output result of…
marcodelapierre Jan 18, 2024
3b2d461
minor fix in GitlabRepositoryProvider: using DEFAULT_BRANCH instead o…
marcodelapierre Jan 18, 2024
2e6461e
Minor edits
bentsherman Jan 23, 2024
a8d2dee
Merge branch 'master' into add/mult_revisions
marcodelapierre Feb 5, 2024
eaf45d8
[ci fast] Merge branch 'master' into add/mult_revisions
pditommaso Feb 10, 2024
ed17284
Merge branch 'master' into add/mult_revisions
marcodelapierre Feb 23, 2024
b3f141d
parametrised revision delimiter
marcodelapierre Feb 28, 2024
6706bd9
nf pull: option to list or not revs for each project
marcodelapierre Feb 28, 2024
e62f543
nicer output for nf list -r
marcodelapierre Feb 28, 2024
bd19877
minor edit to CmdList
marcodelapierre Feb 29, 2024
c0268af
AssetManager: adding listRevisions method (work in progress)
marcodelapierre Feb 29, 2024
aae2afc
small tune to CmdList
marcodelapierre Feb 29, 2024
268ec79
minor tweak to CmdList
marcodelapierre Feb 29, 2024
ac8d755
AssetManager: listRevisions method now working
marcodelapierre Feb 29, 2024
70c8bcc
CmdDrop option to drop all revisions of given project
marcodelapierre Feb 29, 2024
8bcd717
AssetManagerTest: added test for method listRevisions
marcodelapierre Mar 4, 2024
4616e7f
docs - cli: add -a options for list and drop
marcodelapierre Mar 4, 2024
e4b9d78
docs - cli: add/update -r option for relevant commands
marcodelapierre Mar 4, 2024
958955a
CmdInfo: now also prints info on pulled revisions
marcodelapierre Mar 4, 2024
f220e98
CmdInfo made smarter when non only non default revisions pulled
marcodelapierre Mar 4, 2024
2ad9a24
CmdInfoTest updated
marcodelapierre Mar 4, 2024
35ea812
CmdInfoTest fix
marcodelapierre Mar 4, 2024
80ecacd
CmdInfo: added code comment
marcodelapierre Mar 4, 2024
5e4b45f
AssetManager: default revision recognised correctly if specified in m…
marcodelapierre Mar 4, 2024
aa94d7b
small CLI Docs update
marcodelapierre Mar 4, 2024
d965ee5
added a couple of comments
marcodelapierre Mar 6, 2024
f6e6174
Merge branch 'master' into add/mult_revisions
marcodelapierre Mar 11, 2024
ca48a97
Merge branch 'master' into add/mult_revisions
pditommaso Mar 17, 2024
12d31a2
fix merge conflicts
marcodelapierre Mar 21, 2024
9aacb2b
Review: REVISION_DELIM and added comments
marcodelapierre Mar 21, 2024
12718c7
review: added method getProjectWithRevision
marcodelapierre Mar 21, 2024
0b57262
updated method getBaseNameWithRevision
marcodelapierre Mar 21, 2024
17067ea
docs/sharing: added paragraph on multiple revisions, with caveat on r…
marcodelapierre Mar 21, 2024
67dc5d5
cmd info: removed sticky current revision, updated docs
marcodelapierre Mar 21, 2024
7716416
fixed unit tests in CmdInfoTest
marcodelapierre Mar 21, 2024
45be84b
Merge branch 'master' into add/mult_revisions
marcodelapierre Apr 4, 2024
2af4ba7
merged from master
marcodelapierre Apr 8, 2024
afa8a1c
Merge branch 'master' into add/mult_revisions
marcodelapierre Apr 12, 2024
dc4bdee
Merge branch 'master' into add/mult_revisions
marcodelapierre Apr 15, 2024
4c93b3e
Merge branch 'master' into add/mult_revisions_apr_revision_path
marcodelapierre Jun 17, 2024
77b55f3
AssetManager: revert back to set revision in checkValidRemoteRepo()
marcodelapierre Jun 24, 2024
4cd7793
Merge branch 'master' into add/mult_revisions_apr_revision_path
marcodelapierre Jun 24, 2024
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
Prev Previous commit
Next Next commit
CmdInfoTest updated 
Signed-off-by: Dr Marco Claudio De La Pierre <marco.delapierre@gmail.com>
  • Loading branch information
@marcodelapierre
marcodelapierre committed Mar 4, 2024
commit 2ad9a24e5ab0286d55c076263b3719269364287b
9 changes: 8 additions & 1 deletion modules/nextflow/src/test/groovy/nextflow/cli/CmdInfoTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,12 @@ class CmdInfoTest extends Specification {

then:
screen.contains(" project name: nextflow-io/hello")
screen.contains(" revision : master")
screen.contains(" repository : https://github.com/nextflow-io/hello")
screen.contains(" local path : $tempDir/nextflow-io/hello" )
screen.contains(" main script : main.nf")
screen.contains(" revisions : ")
screen.contains(" * master (default)")
screen.contains(" * P master (default)")
}

def 'should print json info' () {
Expand All @@ -87,12 +88,15 @@ class CmdInfoTest extends Specification {

then:
json.projectName == "nextflow-io/hello"
json.revision == "master"
json.repository == "https://github.com/nextflow-io/hello"
json.localPath == "$tempDir/nextflow-io/hello"
json.manifest.mainScript == 'main.nf'
json.manifest.defaultBranch == 'master'
json.revisions.current == 'master'
json.revisions.master == 'master'
json.revisions.pulled.size()>1
json.revisions.pulled.any { it == 'master' }
json.revisions.branches.size()>1
json.revisions.branches.any { it.name == 'master' }
json.revisions.tags.size()>1
Expand All @@ -113,12 +117,15 @@ class CmdInfoTest extends Specification {

then:
json.projectName == "nextflow-io/hello"
json.revision == "master"
json.repository == "https://github.com/nextflow-io/hello"
json.localPath == "$tempDir/nextflow-io/hello"
json.manifest.mainScript == 'main.nf'
json.manifest.defaultBranch == 'master'
json.revisions.current == 'master'
json.revisions.master == 'master'
json.revisions.pulled.size()>1
json.revisions.pulled.any { it == 'master' }
json.revisions.branches.size()>1
json.revisions.branches.any { it.name == 'master' }
json.revisions.tags.size()>1
Expand Down
Loading