From 952e3528a393b1685d69864c2b57ef4a68a0eae7 Mon Sep 17 00:00:00 2001 From: Chris Pressey Date: Tue, 16 Jul 2019 16:22:29 +0100 Subject: [PATCH 1/3] Try this. --- .circleci/config.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..14b928d --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,26 @@ +# Python CircleCI 2.0 configuration file +# +# Check https://circleci.com/docs/2.0/language-python/ for more details +# +version: 2 +jobs: + build: + docker: + - image: circleci/python:3.6.1 + + working_directory: ~/SixtyPical + + steps: + - checkout + + - run: + name: install dependencies + command: | + git clone https://github.com/catseye/Falderal + git clone https://github.com/catseye/dcc6502 + (cd dcc6502 && make) + + - run: + name: run tests + command: | + PATH=dcc6502:Falderal/bin:$PATH ./test.sh From 775af38960a9b57316b190515bae5bff82f2e93c Mon Sep 17 00:00:00 2001 From: Chris Pressey Date: Tue, 16 Jul 2019 16:23:30 +0100 Subject: [PATCH 2/3] Change config. --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 14b928d..a0213db 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,6 +16,7 @@ jobs: - run: name: install dependencies command: | + echo "hi" git clone https://github.com/catseye/Falderal git clone https://github.com/catseye/dcc6502 (cd dcc6502 && make) From 0ef0dc162823cc9a02608976a1a0037bab049cd7 Mon Sep 17 00:00:00 2001 From: Chris Pressey Date: Tue, 16 Jul 2019 16:26:16 +0100 Subject: [PATCH 3/3] dcc6502-adapter fixes. --- tests/appliances/bin/dcc6502-adapter | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/appliances/bin/dcc6502-adapter b/tests/appliances/bin/dcc6502-adapter index 28c20b6..85b6f17 100755 --- a/tests/appliances/bin/dcc6502-adapter +++ b/tests/appliances/bin/dcc6502-adapter @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # script that allows the binary output of sixtypical --output-format=c64-basic-prg --compile to be # disassembled by https://github.com/tcarmelveilleux/dcc6502 @@ -19,5 +19,4 @@ f.close() lines = [line for line in check_output("dcc6502 -o 2061 {}".format(filename), shell=True).split('\n') if line and not line.startswith(';')] lines = [re.sub(r'\s*\;.*$', '', line) for line in lines] -lines.pop() sys.stdout.write('\n'.join(lines))