From 59f88ead3f1cd70c2ff15e22f1db45df58b06055 Mon Sep 17 00:00:00 2001 From: Byron Lathi Date: Fri, 29 Sep 2023 04:25:54 +0000 Subject: [PATCH 1/4] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..ac44185 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,30 @@ +# This file is a template, and might need editing before it works on your project. +# This is a sample GitLab CI/CD configuration file that should run without any modifications. +# It demonstrates a basic 3 stage CI/CD pipeline. Instead of real tests or scripts, +# it uses echo commands to simulate the pipeline execution. +# +# A pipeline is composed of independent jobs that run scripts, grouped into stages. +# Stages run in sequential order, but jobs within stages run in parallel. +# +# For more information, see: https://docs.gitlab.com/ee/ci/yaml/index.html#stages +# +# You can copy and paste this template into a new `.gitlab-ci.yml` file. +# You should not add this template to an existing `.gitlab-ci.yml` file by using the `include:` keyword. +# +# To contribute improvements to CI/CD templates, please follow the Development guide at: +# https://docs.gitlab.com/ee/development/cicd/templates.html +# This specific template is located at: +# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Getting-Started.gitlab-ci.yml + +stages: # List of stages for jobs, and their order of execution + - build + +build-job: # This job runs in the build stage, which runs first. + tags: + - efinity + stage: build + script: + - env + - source init_env.sh + - cd hw/efinix_fpga + - make \ No newline at end of file From d113498459ebc248fbe7dc44db26b001af618f00 Mon Sep 17 00:00:00 2001 From: Byron Lathi Date: Thu, 28 Sep 2023 21:28:39 -0700 Subject: [PATCH 2/4] Try a bad commit --- hw/efinix_fpga/src/super6502.sv | 2 ++ hw/efinix_fpga/super6502.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/efinix_fpga/src/super6502.sv b/hw/efinix_fpga/src/super6502.sv index b0b1a49..bdba1af 100644 --- a/hw/efinix_fpga/src/super6502.sv +++ b/hw/efinix_fpga/src/super6502.sv @@ -56,6 +56,8 @@ assign cpu_nmib = '1; logic w_wait; assign cpu_rdy = ~w_wait; +logic no_semicolon + assign cpu_phi2 = clk_2; logic w_sdr_init_done; diff --git a/hw/efinix_fpga/super6502.xml b/hw/efinix_fpga/super6502.xml index 6c9b7fe..ee7dc15 100644 --- a/hw/efinix_fpga/super6502.xml +++ b/hw/efinix_fpga/super6502.xml @@ -1,4 +1,4 @@ - + From d5bb93f9c937dd1d64ca25e1d17b465e0f5b5b17 Mon Sep 17 00:00:00 2001 From: Byron Lathi Date: Thu, 28 Sep 2023 21:30:38 -0700 Subject: [PATCH 3/4] Fix the bad commit --- hw/efinix_fpga/src/super6502.sv | 2 -- hw/efinix_fpga/super6502.xml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/efinix_fpga/src/super6502.sv b/hw/efinix_fpga/src/super6502.sv index bdba1af..b0b1a49 100644 --- a/hw/efinix_fpga/src/super6502.sv +++ b/hw/efinix_fpga/src/super6502.sv @@ -56,8 +56,6 @@ assign cpu_nmib = '1; logic w_wait; assign cpu_rdy = ~w_wait; -logic no_semicolon - assign cpu_phi2 = clk_2; logic w_sdr_init_done; diff --git a/hw/efinix_fpga/super6502.xml b/hw/efinix_fpga/super6502.xml index ee7dc15..ee79774 100644 --- a/hw/efinix_fpga/super6502.xml +++ b/hw/efinix_fpga/super6502.xml @@ -1,4 +1,4 @@ - + From df89962932d636e18c082249ec50c17d0875458d Mon Sep 17 00:00:00 2001 From: Byron Lathi Date: Thu, 28 Sep 2023 21:34:42 -0700 Subject: [PATCH 4/4] remove env call --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac44185..ce325bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,6 @@ build-job: # This job runs in the build stage, which runs first. - efinity stage: build script: - - env - source init_env.sh - cd hw/efinix_fpga - - make \ No newline at end of file + - make