fixup! Use cmake for third party

pytorch · Jun 30, 2020 · 2eb6739 · 2eb6739
1 parent 75c62ac
commit 2eb6739
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -106,13 +106,7 @@ jobs:
       - run:
           command: |
               mkdir -p third_party/archives/
-              wget --directory-prefix=third_party/archives/ \
-                  https://ftp.osuosl.org/pub/xiph/releases/ogg/libogg-1.3.3.tar.gz \
-                  https://ftp.osuosl.org/pub/xiph/releases/flac/flac-1.3.2.tar.xz \
-                  https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-1.3.6.tar.gz \
-                  https://downloads.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz \
-                  https://downloads.sourceforge.net/project/mad/libmad/0.15.1b/libmad-0.15.1b.tar.gz \
-                  https://downloads.sourceforge.net/project/sox/sox/14.4.2/sox-14.4.2.tar.bz2
+              wget --no-clobber --directory-prefix=third_party/archives/ $(awk '/URL /{print $2}' third_party/CMakeLists.txt)
       - save_cache:
 
           key: tp-nix-v1-{{ checksum ".cachekey" }}

diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in
@@ -101,21 +101,15 @@ jobs:
       - restore_cache:
           {% raw %}
           keys:
-            - tp-nix-v1-{{ checksum ".cachekey" }}
+            - tp-nix-v2-{{ checksum ".cachekey" }}
           {% endraw %}
       - run:
           command: |
               mkdir -p third_party/archives/
-              wget --directory-prefix=third_party/archives/ \
-                  https://ftp.osuosl.org/pub/xiph/releases/ogg/libogg-1.3.3.tar.gz \
-                  https://ftp.osuosl.org/pub/xiph/releases/flac/flac-1.3.2.tar.xz \
-                  https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-1.3.6.tar.gz \
-                  https://downloads.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz \
-                  https://downloads.sourceforge.net/project/mad/libmad/0.15.1b/libmad-0.15.1b.tar.gz \
-                  https://downloads.sourceforge.net/project/sox/sox/14.4.2/sox-14.4.2.tar.bz2
+              wget --no-clobber --directory-prefix=third_party/archives/ $(awk '/URL /{print $2}' third_party/CMakeLists.txt)
       - save_cache:
           {% raw %}
-          key: tp-nix-v1-{{ checksum ".cachekey" }}
+          key: tp-nix-v2-{{ checksum ".cachekey" }}
           {% endraw %}
           paths:
             - third_party/archives