Update versions (#169)

AnHeuermann · web-flow · commit b5035c39f77e · 2023-02-22T16:59:02.000+01:00
* Updating OpenModelica versions

  - Update setup-openmodelica to v0.4.1
  - Added/updated OpenModelica versions to src/versions.json
  - Updated README

* Adding devcontainer for Linux
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -0,0 +1,25 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
+{
+	"name": "Ubuntu",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/base:jammy",
+	"features": {
+		"ghcr.io/devcontainers-contrib/features/typescript:2": {}
+	}
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "uname -a",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}
diff --git a/README.md b/README.md
@@ -19,6 +19,7 @@ On Linux apt is used to install OpenModelica, on Windows the installer executabl
                   Can be `'64'` or `'32'`.
 - `packages`: OpenModelica APT packages to install. Only used on Linux OS.
   - For example `'omc'` for the OpenModelica Compiler or `'omsimulator'` for OMSimulator.
+    Use one package per line.
 
 ## Available OpenModelica versions
 
@@ -27,8 +28,10 @@ On Linux apt is used to install OpenModelica, on Windows the installer executabl
 | nightly      | Linux   | amd64, arm64, armhf, i386 | ✔️       |
 | stable       | Linux   | amd64, arm64, armhf, i386 | ✔️       |
 | release      | Linux   | amd64, arm64, armhf, i386 | ✔️       |
-| 1.19.2       | Linux   | amd64, arm64, armhf, i386 | ❌       |
+| 1.20.0       | Linux   | amd64, arm64, armhf, i386 | ✔️       |
+| 1.19.2       | Linux   | amd64, arm64, armhf, i386 | ✔️       |
 | 1.19.1       | Linux   | amd64, arm64, armhf, i386 | ❌       |
+| 1.19.0       | Linux   | amd64, arm64, armhf, i386 | ❌       |
 | 1.18.1       | Linux   | amd64, arm64, armhf, i386 | ✔️       |
 | 1.18.0       | Linux   | amd64, arm64, armhf, i386 | ✔️       |
 | 1.17.0       | Linux   | amd64, arm64, armhf, i386 | ☑️       |
@@ -40,9 +43,10 @@ On Linux apt is used to install OpenModelica, on Windows the installer executabl
 | 1.14.2       | Linux   | amd64, arm64, armhf, i386 | ☑️       |
 | 1.14.1       | Linux   | amd64, arm64, armhf, i386 | ☑️       |
 | 1.13.2       | Linux   | amd64, arm64, armhf, i386 | ☑️       |
-| nightly      | Windows | 64bit                     | ☑️       |
+| nightly      | Windows | 64bit                     | ✔️       |
 | stable       | Windows | 64bit                     | ✔️       |
-| release      | Windows | 64bit                     | ☑️       |
+| release      | Windows | 64bit                     | ✔️       |
+| 1.20.0       | Windows | 64bit                     | ✔️       |
 | 1.19.2       | Windows | 64bit                     | ✔️       |
 | 1.19.0       | Windows | 64bit                     | ☑️       |
 | 1.18.1       | Windows | 64bit                     | ☑️       |
@@ -60,7 +64,7 @@ On Linux apt is used to install OpenModelica, on Windows the installer executabl
 ```yaml
 - uses: AnHeuermann/setup-openmodelica@v0.4
   with:
-    version: '1.18'
+    version: '1.20'
     packages: |
       'omc'
       'omsimulator'
diff --git a/__tests__/installer.test.ts b/__tests__/installer.test.ts
@@ -37,7 +37,7 @@ function linuxTests(): void {
     let outVer: installer.VersionType
 
     outVer = installer.getOMVersion('1')
-    expect(outVer.version).toEqual('1.18.1')
+    expect(outVer.version).toEqual('1.20.0')
 
     outVer = installer.getOMVersion('1.18')
     expect(outVer.version).toEqual('1.18.1')
@@ -58,17 +58,17 @@ function linuxTests(): void {
     expect(outVer.type).toEqual('release')
   })
 
-  //test(
-  //  'Install 64 bit OpenModelica release 1.19',
-  //  async () => {
-  //    await purgeOMC()
-  //    const version = installer.getOMVersion('1.19')
-  //    await installer.installOM(['omc'], version, '64')
-  //    const resVer = await installer.showVersion('omc')
-  //    expect(resVer).toEqual('1.19.2')
-  //  },
-  //  10 * 60000
-  //)
+  test(
+    'Install 64 bit OpenModelica release 1.19',
+    async () => {
+      await purgeOMC()
+      const version = installer.getOMVersion('1.19')
+      await installer.installOM(['omc'], version, '64')
+      const resVer = await installer.showVersion('omc')
+      expect(resVer).toEqual('1.19.2')
+    },
+    10 * 60000
+  )
 
   test(
     'Try to install 64 bit OpenModelica release 1.18.0 which is not availabe on jammy',
diff --git a/action.yml b/action.yml
@@ -9,7 +9,7 @@ inputs:
     required: false
     default: 'release'
   architecture: 
-    description: 'The architecture of Openmodelica to be used.
+    description: 'The architecture of OpenModelica to be used.
                   Can be "64" or "32".'
     required: false
     default: '64'
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "setup-openmodelica",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "engines": {
     "node": ">=18.0.0"
   },
diff --git a/src/installer.ts b/src/installer.ts
@@ -149,7 +149,7 @@ async function aptInstallOM(
   )
   const distro = out.stdout.trim()
   if ((version.version !== 'nightly') && (version.version !== 'stable') && (version.version !== 'release')) {
-    const response = await fetch(`${version.address}/${distro}`)
+    const response = await fetch(`${version.address}dists/${distro}`)
     if (response.status === 404) {
       throw new Error(`Distribution ${distro} not available for OpenModelica version ${version.version}.`)
     }
diff --git a/src/versions.json b/src/versions.json
@@ -10,13 +10,19 @@
       "version": "stable",
       "type": "stable",
       "arch": "64",
-      "address": "https://build.openmodelica.org/omc/builds/windows/releases/1.19/2/64bit/OpenModelica-v1.19.2-64bit.exe"
+      "address": "https://build.openmodelica.org/omc/builds/windows/releases/1.20/0/64bit/OpenModelica-v1.20.0-64bit.exe"
     },
     {
       "version": "release",
       "type": "release",
       "arch": "64",
-      "address": "https://build.openmodelica.org/omc/builds/windows/releases/1.19/2/64bit/OpenModelica-v1.19.2-64bit.exe"
+      "address": "https://build.openmodelica.org/omc/builds/windows/releases/1.20/0/64bit/OpenModelica-v1.20.0-64bit.exe"
+    },
+    {
+      "version": "1.20.0",
+      "type": "release",
+      "arch": "64",
+      "address": "https://build.openmodelica.org/omc/builds/windows/releases/1.20/0/64bit/OpenModelica-v1.20.0-64bit.exe"
     },
     {
       "version": "1.19.2",
@@ -70,6 +76,18 @@
       "type": "stable",
       "address": "https://build.openmodelica.org/apt"
     },
+    {
+      "version": "1.20.0",
+      "aptname": "1.20.0-1",
+      "type": "release",
+      "address": "https://build.openmodelica.org/omc/builds/linux/releases/1.20.0/"
+    },
+    {
+      "version": "1.19.2",
+      "aptname": "1.19.2-1",
+      "type": "release",
+      "address": "https://build.openmodelica.org/omc/builds/linux/releases/1.19.2/"
+    },
     {
       "version": "1.18.1",
       "aptname": "1.18.1-1",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "setup-openmodelica",`
`3`		`- "version": "0.4.0",`
	`3`	`+ "version": "0.4.1",`
`4`	`4`	`"engines": {`
`5`	`5`	`"node": ">=18.0.0"`
`6`	`6`	`},`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ async function aptInstallOM(`
`149`	`149`	`)`
`150`	`150`	`const distro = out.stdout.trim()`
`151`	`151`	`if ((version.version !== 'nightly') && (version.version !== 'stable') && (version.version !== 'release')) {`
`152`		- const response = await fetch(`${version.address}/${distro}`)
	`152`	+ const response = await fetch(`${version.address}dists/${distro}`)
`153`	`153`	`if (response.status === 404) {`
`154`	`154`	throw new Error(`Distribution ${distro} not available for OpenModelica version ${version.version}.`)
`155`	`155`	`}`