From 0deb947b6dfae2d15927055c4b5a2ffc4e563359 Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Mon, 4 Mar 2024 15:30:46 -0700 Subject: [PATCH 1/6] export symbol generator --- lib/scip_dart.dart | 1 + lib/src/symbol_generator.dart | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/scip_dart.dart b/lib/scip_dart.dart index 9e98f6d7..072b5ff1 100644 --- a/lib/scip_dart.dart +++ b/lib/scip_dart.dart @@ -1 +1,2 @@ export 'src/indexer.dart' show indexPackage; +export 'src/symbol_generator.dart' show SymbolGenerator; \ No newline at end of file diff --git a/lib/src/symbol_generator.dart b/lib/src/symbol_generator.dart index a57f4b32..a1dd7202 100644 --- a/lib/src/symbol_generator.dart +++ b/lib/src/symbol_generator.dart @@ -47,7 +47,7 @@ class SymbolGenerator { return [ 'scip-dart', _getPackage(element), - _getDescriptor(element), + descriptor, ].join(' '); } From 3c971de4c574c260ca2640c5dcf66809aef7f7af Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Mon, 4 Mar 2024 15:31:45 -0700 Subject: [PATCH 2/6] different file export --- lib/scip_dart.dart | 3 +-- lib/symbol_generator.dart | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 lib/symbol_generator.dart diff --git a/lib/scip_dart.dart b/lib/scip_dart.dart index 072b5ff1..8dc7b81a 100644 --- a/lib/scip_dart.dart +++ b/lib/scip_dart.dart @@ -1,2 +1 @@ -export 'src/indexer.dart' show indexPackage; -export 'src/symbol_generator.dart' show SymbolGenerator; \ No newline at end of file +export 'src/indexer.dart' show indexPackage; \ No newline at end of file diff --git a/lib/symbol_generator.dart b/lib/symbol_generator.dart new file mode 100644 index 00000000..6337202f --- /dev/null +++ b/lib/symbol_generator.dart @@ -0,0 +1 @@ +export 'src/symbol_generator.dart' show SymbolGenerator; \ No newline at end of file From ddc25ffe926a00a2c1792f461fdb2737b623a0b1 Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Mon, 4 Mar 2024 15:32:59 -0700 Subject: [PATCH 3/6] updated documentation for the symbol generator internals --- lib/src/symbol_generator.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/symbol_generator.dart b/lib/src/symbol_generator.dart index a1dd7202..9aaf1bca 100644 --- a/lib/src/symbol_generator.dart +++ b/lib/src/symbol_generator.dart @@ -17,7 +17,7 @@ class SymbolGenerator { /// that should be used for the element. If no element is found, /// [_localElementIndex] should be used to generate one. /// - /// Use [] + /// Use [_localSymbolFor] to generate new local symbols Map _localElementRegistry = {}; SymbolGenerator(this._packageConfig, this._pubspec); From 32eca3545bfa8f694d2e4f67efadb86bd5de8398 Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Mon, 4 Mar 2024 15:34:00 -0700 Subject: [PATCH 4/6] fmt --- lib/scip_dart.dart | 2 +- lib/symbol_generator.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/scip_dart.dart b/lib/scip_dart.dart index 8dc7b81a..9e98f6d7 100644 --- a/lib/scip_dart.dart +++ b/lib/scip_dart.dart @@ -1 +1 @@ -export 'src/indexer.dart' show indexPackage; \ No newline at end of file +export 'src/indexer.dart' show indexPackage; diff --git a/lib/symbol_generator.dart b/lib/symbol_generator.dart index 6337202f..ccaa27fd 100644 --- a/lib/symbol_generator.dart +++ b/lib/symbol_generator.dart @@ -1 +1 @@ -export 'src/symbol_generator.dart' show SymbolGenerator; \ No newline at end of file +export 'src/symbol_generator.dart' show SymbolGenerator; From e1ffe8d334951260e2178f54ea317a8fa8a543ac Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Mon, 4 Mar 2024 15:53:25 -0700 Subject: [PATCH 5/6] upload artifacts in dockerfile --- Dockerfile | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Dockerfile b/Dockerfile index 449fd746..f1cf4c9a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1 +1,21 @@ +FROM dart:2.19 + +# Expose env vars for git ssh access +ARG GIT_SSH_KEY +ARG KNOWN_HOSTS_CONTENT +# Install SSH keys for git ssh access +RUN mkdir /root/.ssh +RUN echo "$KNOWN_HOSTS_CONTENT" > "/root/.ssh/known_hosts" +RUN echo "$GIT_SSH_KEY" > "/root/.ssh/id_rsa" +RUN chmod 700 /root/.ssh/ +RUN chmod 600 /root/.ssh/id_rsa +RUN echo "Setting up ssh-agent for git-based dependencies" +RUN eval "$(ssh-agent -s)" && \ + ssh-add /root/.ssh/id_rsa + +WORKDIR /build/ +ADD pubspec.yaml /build +RUN dart pub get +ARG BUILD_ARTIFACTS_AUDIT=/build/pubspec.lock + FROM scratch \ No newline at end of file From d6e8a27f09cb1a104cc63377dc9cd3fb667f2529 Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Mon, 4 Mar 2024 16:01:11 -0700 Subject: [PATCH 6/6] run pub get --- Dockerfile | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index f1cf4c9a..1f3f575e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,21 +1,4 @@ -FROM dart:2.19 - -# Expose env vars for git ssh access -ARG GIT_SSH_KEY -ARG KNOWN_HOSTS_CONTENT -# Install SSH keys for git ssh access -RUN mkdir /root/.ssh -RUN echo "$KNOWN_HOSTS_CONTENT" > "/root/.ssh/known_hosts" -RUN echo "$GIT_SSH_KEY" > "/root/.ssh/id_rsa" -RUN chmod 700 /root/.ssh/ -RUN chmod 600 /root/.ssh/id_rsa -RUN echo "Setting up ssh-agent for git-based dependencies" -RUN eval "$(ssh-agent -s)" && \ - ssh-add /root/.ssh/id_rsa - -WORKDIR /build/ -ADD pubspec.yaml /build +FROM drydock-prod.workiva.net/workiva/dart2_base_image:2 +ADD pubspec.yaml pubspec.yaml RUN dart pub get -ARG BUILD_ARTIFACTS_AUDIT=/build/pubspec.lock - -FROM scratch \ No newline at end of file +FROM scratch