From 38ca47cc2035735c5b866fcadfd1af1f969ce91d Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Thu, 25 Apr 2024 08:37:44 +0200
Subject: [PATCH] Cleanups and update of VS action

---
 .github/workflows/test-build.yml   | 14 ++++----------
 .github/workflows/test-compile.yml |  8 +-------
 .github/workflows/vs.yml           |  2 +-
 .gitignore                         |  1 -
 4 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index 01b5c025aeb..e499abd3ea6 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -1,12 +1,6 @@
 name: Build and run tests
 
-on:
-  pull_request:
-    branches:
-    - main
-  push:
-    branches:
-    - main
+on: [push, pull_request]
 
 jobs:
   build-yosys:
@@ -16,7 +10,7 @@ jobs:
       CC: clang
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-13]
+        os: [ubuntu-latest, macos-13]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -58,7 +52,7 @@ jobs:
       CC: clang
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-13]
+        os: [ubuntu-latest, macos-13]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -125,7 +119,7 @@ jobs:
       CC: clang
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-latest]
       fail-fast: false
     steps:
       - name: Checkout Yosys
diff --git a/.github/workflows/test-compile.yml b/.github/workflows/test-compile.yml
index 6c1f52272a0..fdaf62b4806 100644
--- a/.github/workflows/test-compile.yml
+++ b/.github/workflows/test-compile.yml
@@ -1,12 +1,6 @@
 name: Compiler testing
 
-on:
-  pull_request:
-    branches:
-    - main
-  push:
-    branches:
-    - main
+on: [push, pull_request]
 
 jobs:
   test-compile:
diff --git a/.github/workflows/vs.yml b/.github/workflows/vs.yml
index 799c5f259f4..d456336474f 100644
--- a/.github/workflows/vs.yml
+++ b/.github/workflows/vs.yml
@@ -25,7 +25,7 @@ jobs:
       - name: unzip
         run: unzip yosys-win32-vcxsrc-latest.zip
       - name: setup-msbuild
-        uses: microsoft/setup-msbuild@v1
+        uses: microsoft/setup-msbuild@v2
       - name: MSBuild
         working-directory: yosys-win32-vcxsrc-latest
         run: msbuild YosysVS.sln /p:PlatformToolset=v142 /p:Configuration=Release /p:WindowsTargetPlatformVersion=10.0.17763.0
diff --git a/.gitignore b/.gitignore
index c9fa89f1e61..6e4ffea4203 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,4 +46,3 @@ __pycache__
 /tests/unit/bintest/
 /tests/unit/objtest/
 /tests/ystests
-/build