diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ff3f844..6ba4b1dc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,17 +12,6 @@ env: MSVC_CONFIG: RelWithDebInfo jobs: - bintray-cleanup: - runs-on: ubuntu-18.04 - - steps: - - name: Remove old artifacts from Bintray - shell: bash - run: | - curl -sfSLO 'https://raw.githubusercontent.com/Ortham/ci-scripts/2.1.4/delete_old_bintray_versions.py' - python3 delete_old_bintray_versions.py -g loot/libloot -b loot/snapshots/libloot -u wrinklyninja -k ${{ secrets.BINTRAY_API_KEY }} -t ${{ secrets.GITHUB_TOKEN }} -n 30 - if: github.event_name == 'push' - # Publish to Artifactory as a separate job that runs after the build jobs # because we must first clean out any existing artifacts for this Git ref, # and we don't want to do that as a pre-build step in case the build fails @@ -100,7 +89,7 @@ jobs: - name: Download Boost run: | - wget https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.gz + wget https://boostorg.jfrog.io/artifactory/main/release//1.72.0/source/boost_1_72_0.tar.gz tar -xf boost_1_72_0.tar.gz - name: Install APT package dependencies @@ -160,14 +149,6 @@ jobs: path: build/package/${{ steps.build-archive.outputs.filename }} if: github.event_name == 'push' - - name: Upload archive to BinTray - shell: bash - run: | - VERSION="${{ steps.get-libloot-version.outputs.version }}" - FILENAME="${{ steps.build-archive.outputs.filename }}" - curl -sfSL -T "build/package/$FILENAME" -u "wrinklyninja:${{ secrets.BINTRAY_API_KEY }}" "https://bintray.com/api/v1/content/loot/snapshots/libloot/${VERSION}/${FILENAME}?publish=1&override=1" - if: github.event_name == 'push' - windows: runs-on: windows-2016 @@ -193,7 +174,7 @@ jobs: - name: Download Boost run: | - curl -sSfLO https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.7z + curl -sSfLO https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.7z 7z x boost_1_72_0.7z - name: Get descriptive libloot version @@ -252,11 +233,3 @@ jobs: name: ${{ steps.build-archive.outputs.filename }} path: build/package/${{ steps.build-archive.outputs.filename }} if: github.event_name == 'push' - - - name: Upload archive to BinTray - shell: bash - run: | - VERSION="${{ steps.get-libloot-version.outputs.version }}" - FILENAME="${{ steps.build-archive.outputs.filename }}" - curl -sfSL -T "build/package/$FILENAME" -u "wrinklyninja:${{ secrets.BINTRAY_API_KEY }}" "https://bintray.com/api/v1/content/loot/snapshots/libloot/${VERSION}/${FILENAME}?publish=1&override=1" - if: github.event_name == 'push' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d06cf45e..a83bdb57 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -65,7 +65,7 @@ jobs: - name: Download Boost run: | - wget https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.gz + wget https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.gz tar -xf boost_1_72_0.tar.gz - name: Install APT package dependencies @@ -155,7 +155,7 @@ jobs: - name: Download Boost run: | - curl -sSfLO https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.7z + curl -sSfLO https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.7z 7z x boost_1_72_0.7z - name: Get descriptive libloot version diff --git a/README.md b/README.md index ccde5b98..cf33696b 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ libloot provides access to LOOT's metadata and sorting functionality, and the LO ## Downloads -Releases are hosted on [GitHub](https://github.com/loot/libloot/releases), and snapshot builds are available on [Bintray](https://bintray.com/loot/snapshots/libloot). The snapshot build archives are named like so: +Releases are hosted on [GitHub](https://github.com/loot/libloot/releases), and snapshot builds are available on [Artifactory](https://loot.jfrog.io/ui/repos/tree/General/libloot). The snapshot build archives are named like so: ``` libloot---g_-.7z