diff --git a/.circleci/config.yml b/.circleci/config.yml index 9cdd9a322..a3abd277e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -474,18 +474,6 @@ jobs: - build_source - build_rpm - build_fedora_33: - docker: - - image: fedora:33 - environment: - RPM_BUILD_NCPUS: "2" - steps: - - install_fedora_dependencies - - checkout - - cmake - - build_source - - build_rpm - build_centos_8: docker: @@ -611,10 +599,6 @@ workflows: filters: tags: only: /.*/ - - build_fedora_33: - filters: - tags: - only: /.*/ - build_mageia_7: diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 51d767af2..4568db6b5 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -393,85 +393,6 @@ jobs: run: rpmbuild -ba ../dist/unix/strawberry.spec - build_fedora_33: - name: Build Fedora 33 - runs-on: ubuntu-latest - container: - image: fedora:33 - env: - RPM_BUILD_NCPUS: "2" - steps: - - uses: actions/checkout@v1.2.0 - - - name: Update packages - run: yum update --assumeyes - - - name: Upgrade packages - run: yum upgrade --assumeyes - - - name: Install Fedora dependencies - run: > - dnf install --assumeyes - @development-tools - redhat-lsb-core - git - glibc - gcc-c++ - rpmdevtools - make - cmake - pkgconfig - glib - man - tar - gettext - openssh - boost-devel - dbus-devel - protobuf-devel - protobuf-compiler - sqlite-devel - alsa-lib-devel - pulseaudio-libs-devel - libnotify-devel - gnutls-devel - qt5-qtbase-devel - qt5-qtx11extras-devel - qt5-qttools-devel - gstreamer1-devel - gstreamer1-plugins-base-devel - taglib-devel - libcdio-devel - libgpod-devel - libplist-devel - libusbmuxd-devel - libmtp-devel - libchromaprint-devel - fftw-devel - desktop-file-utils - libappstream-glib - hicolor-icon-theme - - name: Create Build Environment - shell: bash - run: cmake -E make_directory build - - name: Configure CMake - shell: bash - working-directory: build - run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE - - name: Create source tarball - working-directory: build - run: ../dist/scripts/maketarball.sh - - name: Create RPM build sources directories - working-directory: build - run: mkdir -p ~/rpmbuild/SOURCES /usr/src/packages/SOURCES - - name: Copy source tarball - working-directory: build - run: cp strawberry-*.tar.xz ~/rpmbuild/SOURCES/ - - name: Build RPM - working-directory: build - run: rpmbuild -ba ../dist/unix/strawberry.spec - - build_centos_8: name: Build CentOS 8 runs-on: ubuntu-latest