fix with deps

objectionary · Dec 13, 2024 · e6c55c7 · e6c55c7
1 parent 2f5424a
commit e6c55c7
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 18 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -40,8 +40,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ~/.m2/repository
-          key: ubuntu-jdk-21-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ubuntu-jdk-21-maven-
+          key: ubuntu-benchmark-jdk-21-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ubuntu-benchmark-jdk-21-maven-
       - run: mvn clean install --errors --batch-mode -Deo.xslMeasuresFile=measures.csv
       - run: |
           set -x

diff --git a/.github/workflows/mvn.yml b/.github/workflows/mvn.yml
@@ -73,4 +73,7 @@ jobs:
           echo multiplexing = false >> %USERPROFILE%\.cargo\config.toml
         shell: cmd
       - run: cargo --version
+      - uses: JesseTG/rm@v1.0.3
+        with:
+          path: ~/.m2/repository/org/eolang
       - run: mvn clean install --errors --batch-mode
diff --git a/.github/workflows/qulice.yml b/.github/workflows/qulice.yml
@@ -41,6 +41,6 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ~/.m2/repository
-          key: ubuntu-jdk-21-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ubuntu-jdk-21-maven-
+          key: ubuntu-qulice-jdk-21-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ubuntu-qulice-jdk-21-maven-
       - run: mvn clean install -DskipTests -DskipITs -Pqulice --errors --batch-mode
diff --git a/eo-maven-plugin/src/test/resources/META-INF/MANIFEST.MF b/eo-maven-plugin/src/test/resources/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
-EO-Version: 0.0-SNAPSHOT
+EO-Version: ${project.version}
 EO-Revision: 1234567
 EO-Dob: 2023-03-19T00:00:00
diff --git a/eo-parser/src/test/resources/META-INF/MANIFEST.MF b/eo-parser/src/test/resources/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
-EO-Version: 0.0.0
+EO-Version: ${project.version}
 EO-Revision: 1234567
 EO-Dob: 2023-03-19T00:00:00
diff --git a/eo-runtime/pom.xml b/eo-runtime/pom.xml
@@ -98,6 +98,12 @@ SOFTWARE.
       <!-- version from parent POM -->
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.jcabi</groupId>
+      <artifactId>jcabi-manifests</artifactId>
+      <!-- version from parent POM -->
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.cactoos</groupId>
       <artifactId>cactoos</artifactId>

diff --git a/eo-runtime/src/test/java/integration/PhiUnphiIT.java b/eo-runtime/src/test/java/integration/PhiUnphiIT.java
@@ -23,6 +23,7 @@
  */
 package integration;
 
+import com.jcabi.manifests.Manifests;
 import com.yegor256.MayBeSlow;
 import com.yegor256.Mktmp;
 import com.yegor256.MktmpResolver;
@@ -74,7 +75,7 @@ void runsTestsAfterPhiAndUnphi(final @Mktmp Path temp) throws IOException {
                         "eo-maven-plugin",
                         System.getProperty(
                             "eo.version",
-                            "1.0-SNAPSHOT"
+                            Manifests.read("EO-Version")
                         )
                     )
                     .execution("phi-unphi")
@@ -136,7 +137,7 @@ void runsTestsAfterPhiAndUnphi(final @Mktmp Path temp) throws IOException {
                         "eo-maven-plugin",
                         System.getProperty(
                             "eo.version",
-                            "1.0-SNAPSHOT"
+                            Manifests.read("EO-Version")
                         )
                     )
                     .execution("compile")

diff --git a/eo-runtime/src/test/java/integration/SnippetIT.java b/eo-runtime/src/test/java/integration/SnippetIT.java
@@ -23,6 +23,7 @@
  */
 package integration;
 
+import com.jcabi.manifests.Manifests;
 import com.yegor256.MayBeSlow;
 import com.yegor256.Mktmp;
 import com.yegor256.MktmpResolver;
@@ -84,22 +85,15 @@ void runsAllSnippets(final String yml, final @Mktmp Path temp) throws IOExceptio
                             xtory.map().get("eo")
                         ).getBytes(StandardCharsets.UTF_8)
                     );
-                f.dependencies().append(
-                    "org.eolang",
-                    "eo-runtime",
-                    System.getProperty(
-                        "eo.version",
-                        "1.0-SNAPSHOT"
-                    )
-                );
+                f.dependencies().appendItself();
                 f.build()
                     .plugins()
                     .append(
                         "org.eolang",
                         "eo-maven-plugin",
                         System.getProperty(
                             "eo.version",
-                            "1.0-SNAPSHOT"
+                            Manifests.read("EO-Version")
                         )
                     )
                     .execution("compile")

diff --git a/eo-runtime/src/test/resources/META-INF/MANIFEST.MF b/eo-runtime/src/test/resources/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
-EO-Version: 0.0-SNAPSHOT
+EO-Version: ${project.version}
 EO-Revision: 1234567
 EO-Dob: 2023-03-19T00:00:00