From 3b71d4b96021b0ddba77267126fcdb927b5ee7af Mon Sep 17 00:00:00 2001 From: Moritz Grimm Date: Tue, 20 Nov 2018 14:27:25 +0100 Subject: [PATCH] Retire CircleCI v1 configuration --- .circleci/config.yml | 48 -------------------------------------------- circle.yml | 19 ------------------ 2 files changed, 67 deletions(-) delete mode 100644 circle.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index 934b3a4..4d2703d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,64 +1,24 @@ -# This configuration was automatically generated from a CircleCI 1.0 config. -# It should include any build commands you had along with commands that CircleCI -# inferred from your project structure. We strongly recommend you read all the -# comments in this file to understand the structure of CircleCI 2.0, as the idiom -# for configuration has changed substantially in 2.0 to allow arbitrary jobs rather -# than the prescribed lifecycle of 1.0. In general, we recommend using this generated -# configuration as a reference rather than using it in production, though in most -# cases it should duplicate the execution of your original 1.0 config. version: 2 jobs: build: working_directory: ~/xiph/ezstream parallelism: 1 shell: /bin/bash --login - # CircleCI 2.0 does not support environment variables that refer to each other the same way as 1.0 did. - # If any of these refer to each other, rewrite them so that they don't or see https://circleci.com/docs/2.0/env-vars/#interpolating-environment-variables-to-set-other-environment-variables . - environment: - CIRCLE_ARTIFACTS: /tmp/circleci-artifacts - CIRCLE_TEST_REPORTS: /tmp/circleci-test-results - # In CircleCI 1.0 we used a pre-configured image with a large number of languages and other packages. - # In CircleCI 2.0 you can now specify your own image, or use one of our pre-configured images. - # The following configuration line tells CircleCI to use the specified docker image as the runtime environment for you job. - # We have selected a pre-built image that mirrors the build environment we use on - # the 1.0 platform, but we recommend you choose an image more tailored to the needs - # of each job. For more information on choosing an image (or alternatively using a - # VM instead of a container) see https://circleci.com/docs/2.0/executor-types/ - # To see the list of pre-built images that CircleCI provides for most common languages see - # https://circleci.com/docs/2.0/circleci-images/ docker: - image: circleci/build-image:ubuntu-14.04-XXL-upstart-1189-5614f37 command: /sbin/init steps: - # Machine Setup - # If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each - # The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly. In 2.0 you can choose where in the course of a job your code should be checked out. - checkout - # Prepare for artifact and test results collection equivalent to how it was done on 1.0. - # In many cases you can simplify this from what is generated here. - # 'See docs on artifact collection here https://circleci.com/docs/2.0/artifacts/' - - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS - # Dependencies - # This would typically go in either a build or a build-and-test job when using workflows - # Restore the dependency cache - restore_cache: keys: - # This branch if available - v1-dep-{{ .Branch }}- - # Default branch if not - v1-dep-develop- - # Any branch if there are none on the default branch - this should be unnecessary if you have your default branch configured correctly - v1-dep- - # This is based on your 1.0 configuration file or project settings - run: sudo apt-get install lcov check libshout-dev libtagc0-dev libxml2-dev - # This is based on your 1.0 configuration file or project settings - run: ./autogen.sh - # Save dependency cache - save_cache: key: v1-dep-{{ .Branch }}-{{ epoch }} paths: - # This is a broad list of cache paths to include many possible development environments - # You can probably delete some of these entries - vendor/bundle - ~/virtualenvs - ~/.m2 @@ -67,9 +27,6 @@ jobs: - ~/.go_workspace - ~/.gradle - ~/.cache/bower - # Test - # This would typically be a build job when using workflows, possibly combined with build - # This is based on your 1.0 configuration file or project settings - run: ./configure - run: make distcheck distclean - run: ./configure CFLAGS='-O0 -fprofile-arcs -ftest-coverage -fstack-protector-all' @@ -77,14 +34,9 @@ jobs: - run: mkdir coverage - run: lcov --capture --output-file coverage/ezstream.lcov --rc lcov_branch_coverage=1 --directory src --test-name ezstream - run: make distclean - # This is based on your 1.0 configuration file or project settings - run: bash <(curl -s https://codecov.io/bash) - # Teardown - # If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each - # Save test results - store_test_results: path: /tmp/circleci-test-results - # Save artifacts - store_artifacts: path: /tmp/circleci-artifacts - store_artifacts: diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 4cc3340..0000000 --- a/circle.yml +++ /dev/null @@ -1,19 +0,0 @@ -dependencies: - pre: - - sudo apt-get install lcov check libshout-dev libtagc0-dev libxml2-dev - - override: - - ./autogen.sh - -test: - override: - - ./configure - - make distcheck distclean - - ./configure CFLAGS='-O0 -fprofile-arcs -ftest-coverage -fstack-protector-all' - - make check - - mkdir coverage - - lcov --capture --output-file coverage/ezstream.lcov --rc lcov_branch_coverage=1 --directory src --test-name ezstream - - make distclean - - post: - - bash <(curl -s https://codecov.io/bash)